From patchwork Wed Nov 16 14:35:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 9431739 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 56C2C60476 for ; Wed, 16 Nov 2016 14:37:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 479A128F16 for ; Wed, 16 Nov 2016 14:37:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3BDAC28F22; Wed, 16 Nov 2016 14:37:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E971528F16 for ; Wed, 16 Nov 2016 14:37:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933661AbcKPOg7 (ORCPT ); Wed, 16 Nov 2016 09:36:59 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34379 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932785AbcKPOfd (ORCPT ); Wed, 16 Nov 2016 09:35:33 -0500 Received: by mail-wm0-f66.google.com with SMTP id g23so11797899wme.1; Wed, 16 Nov 2016 06:35:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=gszSr7QTWlzCjAkpbJ9zT7HoPYWwtuY95lbIpOaBPEA=; b=XGRxjoFkRSqJ5MY51vU8ZGo1Qg8JBHqhHHj05g9Zen7cBNkyul29IaRk34OB0twFx4 aG3lxM55e2dCsRCPalpsEdGIWEnsb9dD22aieQGS8s2FvrxkDRSbxHmQWwfL7+rjc9j9 3yg2171XLzfJuzyINXaGrSi22O5fWASSgF9qZaVNakXfy+EvZtdMzcFqEZw4RzZg61x6 BFpA0Z51zRl+sOin7FtFSex+lE2MQdrluyQeCQGtaaTWX6FXhmrRY3eAGC4hOs1xmk0e ZXwCrywQYDXAGXsrr7MN6tDSSO0itxDIko5yGr4yU94q+5W+L6HWlqahMo71r6EAXRU7 wlkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=gszSr7QTWlzCjAkpbJ9zT7HoPYWwtuY95lbIpOaBPEA=; b=WcEGU8EK7eWi25KBXtbUGRGEy9woEW9BuVTfF4zNghoIk3B17kN2oLWBablEbpvG9f EsFXo3hswkSOkXO3FgX3c8Pyyu05TZvQp1z4McSM6QHAWTwrM/8wNBK/A4CmkJ8OxDxU rWtU1i7PZoXY2qaNIpZHwfY31c6D8gX0yIW9+xqDIF+9RyDCLcg2RfJjoM6FcPWgRZpd CPz4fDUByAzTFcAPYqN+9vFKBtF3YuWXcvCFYg4d3DtDMqEc9H5S2ITk3qHUkYDabkI0 2p41uyBMR1UJfN1XLUPI90Yx1gG2IkQlkWASAvrSeBXDrULFEWXSvNELN8HrsXdUI/9u LNNA== X-Gm-Message-State: ABUngvdxJGLE5azcKYTVjO1nh/fR5oe4bFv76TFVx8IgCie1vx292WTuWN4T2LIqV9JdNw== X-Received: by 10.25.77.133 with SMTP id a127mr1271738lfb.165.1479306932140; Wed, 16 Nov 2016 06:35:32 -0800 (PST) Received: from xi.terra (c-04aadb54.07-184-6d6c6d4.cust.bredbandsbolaget.se. [84.219.170.4]) by smtp.gmail.com with ESMTPSA id u12sm7857106lja.4.2016.11.16.06.35.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Nov 2016 06:35:31 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.87) (envelope-from ) id 1c71JB-0007Dd-H2; Wed, 16 Nov 2016 15:35:29 +0100 From: Johan Hovold To: Mugunthan V N Cc: Grygorii Strashko , linux-omap@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH net 6/7] net: ethernet: ti: cpsw: add missing sanity check Date: Wed, 16 Nov 2016 15:35:15 +0100 Message-Id: <1479306916-27673-7-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1479306916-27673-1-git-send-email-johan@kernel.org> References: <1479306916-27673-1-git-send-email-johan@kernel.org> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Make sure to check for allocation failures before dereferencing a NULL-pointer during probe. Fixes: 649a1688c960 ("net: ethernet: ti: cpsw: create common struct to hold shared driver data") Signed-off-by: Johan Hovold --- drivers/net/ethernet/ti/cpsw.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 421da97a5be6..411be060fee6 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -2588,6 +2588,9 @@ static int cpsw_probe(struct platform_device *pdev) int irq; cpsw = devm_kzalloc(&pdev->dev, sizeof(struct cpsw_common), GFP_KERNEL); + if (!cpsw) + return -ENOMEM; + cpsw->dev = &pdev->dev; ndev = alloc_etherdev_mq(sizeof(struct cpsw_priv), CPSW_MAX_QUEUES);