From patchwork Fri Dec 10 12:40:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 75082 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id ECE91B7043 for ; Fri, 10 Dec 2010 23:47:28 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756055Ab0LJMrY (ORCPT ); Fri, 10 Dec 2010 07:47:24 -0500 Received: from mail-ww0-f44.google.com ([74.125.82.44]:44314 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755762Ab0LJMrW (ORCPT ); Fri, 10 Dec 2010 07:47:22 -0500 Received: by wwa36 with SMTP id 36so3667353wwa.1 for ; Fri, 10 Dec 2010 04:47:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=Nly2jPngJynF1dyA8D5OGWBgZegVHstvKR0HxNS8ptk=; b=l4PzNz/ZC6+ybYzPS47zdJO1qFKZ+gp2hY7MFP2BujtVvBHdFqOvbN51UxZiQuzEa1 DcTz2dDn23FaV3pxeU2BTE8rt/ykbGHXOzjLqiqk8wRVl9dzL8++HzgbCuxvfLLU3Iju ZzNErO2doztbGlJ5iJ25StwOJstbL7dFWIDiM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=X6HL49CZOiotXg5FHxBd+jVwLxTJ+H1VoGljT63NO4fknY7yrOXNaBXpzzsD35T7m5 agycxBLLncXHDOpyVavjk2x1LQiXfc3NFUIgFYQ9oiE7v4MGXipgqc4bwc8PQMnsRSx+ 1FNS+uXnjZJlXxCEtAVH6b9XLc11JAOeTmxPg= Received: by 10.216.46.193 with SMTP id r43mr2193629web.20.1291984822953; Fri, 10 Dec 2010 04:40:22 -0800 (PST) Received: from bicker (h2d3c.n1.ips.mtn.co.ug [41.210.173.60]) by mx.google.com with ESMTPS id o51sm1447138wes.15.2010.12.10.04.40.17 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 10 Dec 2010 04:40:20 -0800 (PST) Date: Fri, 10 Dec 2010 15:40:09 +0300 From: Dan Carpenter To: Karsten Keil Cc: "David S. Miller" , netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] isdn: return -EFAULT if copy_from_user() fails Message-ID: <20101210124009.GC10623@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We should be returning -EFAULT here. Mostly this patch is to silence a smatch warning. The upper levels of this driver turn all non-zero return values from isar_load_firmware() into 1. Signed-off-by: Dan Carpenter --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/isdn/hisax/isar.c b/drivers/isdn/hisax/isar.c index 2e72227..9cd4829 100644 --- a/drivers/isdn/hisax/isar.c +++ b/drivers/isdn/hisax/isar.c @@ -212,9 +212,9 @@ isar_load_firmware(struct IsdnCardState *cs, u_char __user *buf) cs->debug &= ~(L1_DEB_HSCX | L1_DEB_HSCX_FIFO); #endif - if ((ret = copy_from_user(&size, p, sizeof(int)))) { + if (copy_from_user(&size, p, sizeof(int))) { printk(KERN_ERR"isar_load_firmware copy_from_user ret %d\n", ret); - return ret; + return -EFAULT; } p += sizeof(int); printk(KERN_DEBUG"isar_load_firmware size: %d\n", size);