From patchwork Mon Jan 13 16:25:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 3478261 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 55E56C02DC for ; Mon, 13 Jan 2014 16:26:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5928120127 for ; Mon, 13 Jan 2014 16:26:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A14B9200ED for ; Mon, 13 Jan 2014 16:26:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754592AbaAMQ0I (ORCPT ); Mon, 13 Jan 2014 11:26:08 -0500 Received: from mail-wi0-f177.google.com ([209.85.212.177]:49654 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752503AbaAMQ0E (ORCPT ); Mon, 13 Jan 2014 11:26:04 -0500 Received: by mail-wi0-f177.google.com with SMTP id hm2so2428780wib.10 for ; Mon, 13 Jan 2014 08:26:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:content-type:mime-version :content-transfer-encoding; bh=Adodd2jgnbGPRt90zEs4QvI90X0oZbb7cAFglf84LdM=; b=GfqoKTjm/j6N0sCxUTZzh6S7qoMRs06tZrB1ilNCpUfFwF1n56wThDsmyTQXqNTbkD K4Yib3Udt76vPZWW/4AciWIOI+Gso++PPS8yDw13aauIugn0a4jmIjX2t7H+FvC+c3dx EfqT5AkoPlSMEqjIEpXFwNYA+qovqsOR+ojdO33ex7a4OL1FCrGDcYsrgLDim9KF8X32 CeiXVO2/+ngmxXrE2NvL8F0Gco9fbieqjbeFHPZzf1wB30NnehJYMSESp37SaEupP9jv ipSt7IPqEgajB9BcRRz/NAkmu6qxe5OWijfACeysxoHcM/LSbhetL1OdbRauWk/GQrfl xWqA== X-Received: by 10.180.104.164 with SMTP id gf4mr15763098wib.35.1389630362216; Mon, 13 Jan 2014 08:26:02 -0800 (PST) Received: from [192.168.1.100] (188.29.100.241.threembb.co.uk. [188.29.100.241]) by mx.google.com with ESMTPSA id 5sm3740281wjw.17.2014.01.13.08.26.00 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Mon, 13 Jan 2014 08:26:01 -0800 (PST) Message-ID: <1389630351.2590.4.camel@canaries32-MCP7A> Subject: [PATCH 5/6] staging: vt6656: sparse fixes: iwctl_giwgenie use memcpy. From: Malcolm Priestley To: gregkh@linuxfoundation.org Cc: linux-wireless@vger.kernel.org Date: Mon, 13 Jan 2014 16:25:51 +0000 X-Mailer: Evolution 3.10.1-2ubuntu2 Mime-Version: 1.0 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.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 extra is in kernel space use memcpy. sparse warning iwctl.c:1595:42: warning: incorrect type in argument 1 (different address spaces) iwctl.c:1595:42: expected void [noderef] *to iwctl.c:1595:42: got char *extra Signed-off-by: Malcolm Priestley --- drivers/staging/vt6656/iwctl.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c index bf56877..3a68dfa 100644 --- a/drivers/staging/vt6656/iwctl.c +++ b/drivers/staging/vt6656/iwctl.c @@ -1591,13 +1591,11 @@ int iwctl_giwgenie(struct net_device *dev, struct iw_request_info *info, wrq->length = 0; if (pMgmt->wWPAIELen > 0) { wrq->length = pMgmt->wWPAIELen; - if (pMgmt->wWPAIELen <= space) { - if (copy_to_user(extra, pMgmt->abyWPAIE, pMgmt->wWPAIELen)) { - ret = -EFAULT; - } - } else { + + if (pMgmt->wWPAIELen <= space) + memcpy(extra, pMgmt->abyWPAIE, pMgmt->wWPAIELen); + else ret = -E2BIG; - } } return ret; }