From patchwork Wed Dec 2 04:18:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brent Taylor X-Patchwork-Id: 7742411 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 43FE59F1C2 for ; Wed, 2 Dec 2015 04:19:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6CEA62063F for ; Wed, 2 Dec 2015 04:19:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5A1E52065F for ; Wed, 2 Dec 2015 04:19:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753244AbbLBESZ (ORCPT ); Tue, 1 Dec 2015 23:18:25 -0500 Received: from mail-ig0-f170.google.com ([209.85.213.170]:37762 "EHLO mail-ig0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752331AbbLBESY (ORCPT ); Tue, 1 Dec 2015 23:18:24 -0500 Received: by igcto18 with SMTP id to18so23090471igc.0; Tue, 01 Dec 2015 20:18:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=joSYB4CUGt4MMYbbtWffnacISDuWQtsGTIef0GDHWRc=; b=zEH3q/egotGfCMHHdiiepRQW0dPevqUob6FE4vgOs09PNi6wVWnjRLDj0GjV6tJKhb YBV8sGvq7HFcdhuYMWEXIMzl5clXPZ0vGaij0w0pH6xoAMPjqgy/NBrpv588mq+xje7t YuENBflqpovBREFSX019ZwNhd0b9ywO0N6tB1TPSt+3VKMMGlB02upkbylZdRFWRNz3s Vr1FyqZQ1EG66Bq1ft/ejPqTEsR053aN7KpQwMYNBr1JsDV5al747QSCd4A4f39O4JvA PpayZ2Nd9WX6kxZOenxU4cmIxQTOBN+aI9/mJGUvLCc9QGjg2CYqSQ7EPCvw490WkzAe UGTw== X-Received: by 10.50.142.40 with SMTP id rt8mr30237242igb.24.1449029903734; Tue, 01 Dec 2015 20:18:23 -0800 (PST) Received: from cartman.taylor.net (c-73-168-44-213.hsd1.il.comcast.net. [73.168.44.213]) by smtp.gmail.com with ESMTPSA id 124sm624333ioz.10.2015.12.01.20.18.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 01 Dec 2015 20:18:23 -0800 (PST) From: Brent Taylor To: kvalo@qca.qualcomm.com Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, ath6kl@lists.infradead.org, Brent Taylor Subject: [v2] ath6kl: Use vmalloc to allocate ar->fw for api1 method Date: Tue, 1 Dec 2015 22:18:18 -0600 Message-Id: <1449029898-15209-1-git-send-email-motobud@gmail.com> X-Mailer: git-send-email 2.6.3 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since commit 8437754c8335 ("ath6kl: Use vmalloc instead of kmalloc for fw") ar->fw is expected to be pointing to memory allocated by vmalloc. If the api1 method (via ath6kl_fetch_fw_api1) is used to allocate memory for ar->fw, then kmemdup is used. This patch checks if the firmware being loaded is the 'fw' image, then use vmalloc, otherwise use kmalloc. Signed-off-by: Brent Taylor --- v2: Fix commit message and code formatting (use tab instaed of spaces) drivers/net/wireless/ath/ath6kl/init.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c index 6ae0734..4f16bd8 100644 --- a/drivers/net/wireless/ath/ath6kl/init.c +++ b/drivers/net/wireless/ath/ath6kl/init.c @@ -673,10 +673,15 @@ static int ath6kl_get_fw(struct ath6kl *ar, const char *filename, return ret; *fw_len = fw_entry->size; - *fw = kmemdup(fw_entry->data, fw_entry->size, GFP_KERNEL); + if (&ar->fw == fw) + *fw = vmalloc(fw_entry->size); + else + *fw = kmalloc(fw_entry->size, GFP_KERNEL); if (*fw == NULL) ret = -ENOMEM; + else + memcpy(*fw, fw_entry->data, fw_entry->size); release_firmware(fw_entry);