From patchwork Mon Nov 9 12:19:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 541748 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 9F8AB1402CC for ; Mon, 9 Nov 2015 23:19:46 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=rasmusvillemoes.dk header.i=@rasmusvillemoes.dk header.b=awdnq2gj; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751383AbbKIMTa (ORCPT ); Mon, 9 Nov 2015 07:19:30 -0500 Received: from mail-lf0-f44.google.com ([209.85.215.44]:36599 "EHLO mail-lf0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750966AbbKIMT1 (ORCPT ); Mon, 9 Nov 2015 07:19:27 -0500 Received: by lfs39 with SMTP id 39so67645926lfs.3 for ; Mon, 09 Nov 2015 04:19:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id; bh=TGp7SyTp2BGq+wTi6Q43v1pXk+262SQ2ogZVKEWg4eg=; b=awdnq2gjIp2vV0vfzl6YhEeeykLs9GSxKVH1KHlP3U5GTciP4XJDvbaT4NsFvImNLG JGUtaoGrRi2iPLJGB23wf0eP/DO8NMPzcBNTETmMKmyNN8m5Nu4n4Zve1+H0Xnk+lHP+ Nh8PKrE+Fql3SySBfFp4+ggx5H1pcPH9R6NsQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=TGp7SyTp2BGq+wTi6Q43v1pXk+262SQ2ogZVKEWg4eg=; b=CLzXio7tn6zLDDeja7+FU1yOkFQ1BKIB+wARV7KTPkgu12zdyu2vzyOfpAiRDgkAZ8 j4HwOFP443euRlqmQoqmx2vcRETkDQEOPRD+qb3IVtJcQ6PEuyoftD5nDPC2bzOCdn60 G0Ur8/IMepx0p+4rRDeTLrC1HW/X74IsRXdWKuI9NsWZT7o1jStxWE/V53jSt5DvruI+ TvTjktbMydyLUak6N3yasPOrkQQRUf1pFXMojDKPM+gPfuNsmqzpGTgJBmpBi9rGpDN1 oIv1hmbsXxnw7WaYxIBydwdNSDZLg2xCgNmYefH7Rp9Ebuc1tFInBWYviOZnSNS1TyDV Gf6w== X-Gm-Message-State: ALoCoQkIQ/c7XJSzuZuIQyX2dkGSmn32RqqUqAVsCW+1kUpULOKusuGrGDw12oxLD2tfTke4zUOV X-Received: by 10.25.155.134 with SMTP id d128mr8661310lfe.14.1447071566218; Mon, 09 Nov 2015 04:19:26 -0800 (PST) Received: from garcia.imf.au.dk ([130.225.20.51]) by smtp.gmail.com with ESMTPSA id 194sm2356240lfd.4.2015.11.09.04.19.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Nov 2015 04:19:25 -0800 (PST) From: Rasmus Villemoes To: Dmitry Tarnyagin Cc: Rasmus Villemoes , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: caif: check return value of alloc_netdev Date: Mon, 9 Nov 2015 13:19:10 +0100 Message-Id: <1447071550-20103-1-git-send-email-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.6.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org I don't know if dev can actually be NULL here, but the test should be above alloc_netdev(), to avoid leaking the struct net_device in case dev is actually NULL. And of course the return value from alloc_netdev should be tested. Signed-off-by: Rasmus Villemoes --- Maybe the existing code was supposed to be "if (!ndev)", and dev cannot be NULL, but then -ENODEV is a slightly odd return value. Doing both tests seems to be the safe choice. drivers/net/caif/caif_spi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/caif/caif_spi.c b/drivers/net/caif/caif_spi.c index de3962014af7..4721948a92f6 100644 --- a/drivers/net/caif/caif_spi.c +++ b/drivers/net/caif/caif_spi.c @@ -730,11 +730,14 @@ int cfspi_spi_probe(struct platform_device *pdev) int res; dev = (struct cfspi_dev *)pdev->dev.platform_data; - ndev = alloc_netdev(sizeof(struct cfspi), "cfspi%d", - NET_NAME_UNKNOWN, cfspi_setup); if (!dev) return -ENODEV; + ndev = alloc_netdev(sizeof(struct cfspi), "cfspi%d", + NET_NAME_UNKNOWN, cfspi_setup); + if (!ndev) + return -ENOMEM; + cfspi = netdev_priv(ndev); netif_stop_queue(ndev); cfspi->ndev = ndev;