From patchwork Tue Aug 10 06:00:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 61336 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 8EBEBB70AA for ; Tue, 10 Aug 2010 16:00:42 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752051Ab0HJGAe (ORCPT ); Tue, 10 Aug 2010 02:00:34 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:65088 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751244Ab0HJGAc (ORCPT ); Tue, 10 Aug 2010 02:00:32 -0400 Received: by ewy23 with SMTP id 23so3701866ewy.19 for ; Mon, 09 Aug 2010 23:00:31 -0700 (PDT) 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=KT0A8bUWgcRF4rM7QKJioHclaHNPTW6kFOhtK+Ws938=; b=ZRQYbsxoQpnM3lGC98ZNVSSfGF/B05OyxEu/pbwOLFYOLDPSW2pAb9CaojZTgFeqtF RpqeNqdxK29St/coF27ozxW+38g1/zExO1qPUS4/Wb1L+RhZbu/UCwb7zhQd2I7MS9d3 fUyXNgqYLXQK4hFi+JSMB0HOSNvPFgLpajpc8= 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=iiQE4QkurlnTRhc2RzzKNxJkCU6oLzJPTa1L86lqKmPmzdyw7YBC2MP4KMeXzEPl8C B5vW/Dw95tOYCOPxkhLhNNC7WHRcZLPsv7O79+c7we4kJ2eGD/TTeJhBXabV1xaEstFm EnhCqK3zkp2XbGPsuNihuYGqbkNufQkAMnXsI= Received: by 10.213.13.133 with SMTP id c5mr13042350eba.26.1281420031365; Mon, 09 Aug 2010 23:00:31 -0700 (PDT) Received: from bicker ([205.177.176.130]) by mx.google.com with ESMTPS id a48sm9151110eei.1.2010.08.09.23.00.20 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 09 Aug 2010 23:00:30 -0700 (PDT) Date: Tue, 10 Aug 2010 08:00:12 +0200 From: Dan Carpenter To: Greg Kroah-Hartman Cc: Andres More , Forest Bond , Jim Lieb , devel@driverdev.osuosl.org, netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] Staging: vt6656: problems in error handling Message-ID: <20100810060012.GR9031@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The first kfree(pDevice) is pointless because pDevice is NULL. The second kfree(pDevice) is a double free because pDevice is the driver's private data and that is already freed by free_netdev(netdev). Also the free_netdev() error path doesn't call usb_put_dev(). 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/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index c528ef0..4fdf837 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -771,10 +771,9 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id) udev = usb_get_dev(udev); netdev = alloc_etherdev(sizeof(DEVICE_INFO)); - if (!netdev) { printk(KERN_ERR DEVICE_NAME ": allocate net device failed\n"); - kfree(pDevice); + rc = -ENOMEM; goto err_nomem; } @@ -800,9 +799,7 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id) rc = register_netdev(netdev); if (rc) { printk(KERN_ERR DEVICE_NAME " Failed to register netdev\n"); - free_netdev(netdev); - kfree(pDevice); - return -ENODEV; + goto err_netdev; } usb_device_reset(pDevice); @@ -820,10 +817,12 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id) return 0; +err_netdev: + free_netdev(netdev); err_nomem: usb_put_dev(udev); - return -ENOMEM; + return rc; } static void device_free_tx_bufs(PSDevice pDevice)