From patchwork Thu Nov 17 16:40:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 696256 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 3tKT6L2HMLz9t2p for ; Fri, 18 Nov 2016 04:44:58 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UQbhpujG"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938986AbcKQRoT (ORCPT ); Thu, 17 Nov 2016 12:44:19 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36784 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751617AbcKQQ6E (ORCPT ); Thu, 17 Nov 2016 11:58:04 -0500 Received: by mail-wm0-f67.google.com with SMTP id m203so22991621wma.3; Thu, 17 Nov 2016 08:58:03 -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=kj+1P/HtxJbIEMjng60eHi/onUlByTbACPQoQ3JAAvY=; b=UQbhpujG0Ep0v/58bDdOiwQ3lQMNfJZs7mjq1fz/Yktx9ixArrA2yrnKju71xeN0qd Yg+/kIJB6V6Q8xTT+cYb7RyF5ei3hI7yja4+9+J5qRQSxzwDp6QkXpA4W5rFdtozgshd giLRkvxBdlxCkXzYaYN6/zVOPRlH77Wi5ZWLDN6rob/pCGYs8EaLOJhYwGpvKH4k8Aqr f4FIOBYOrwgRLqmX71gdDW6YIgu47BClZcDG9FJLjWKMnZ8bH7WPI7cxCAdFNzVoQ76Y uoAVuSa3/tvVFgGydBqczovAb6GIMn+eldlfGT/sZ9WHiKFyJsjdw9WLEHi3cAgaAGpj EZpw== 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=kj+1P/HtxJbIEMjng60eHi/onUlByTbACPQoQ3JAAvY=; b=NdJHXS+a7TLHHxbetXqoS9vXiuUQD1eiJxYhY7XG83vMsCheKn5GlCOW5jq+m5YjP3 RqngSGBLytJ1tqEY03gkx68GvfkFAzua8O9qgN0qkMdJUgz8054fTzzmTTPloSX4bHSZ gp4NiGcRLA3HaJDM3j8sGhKHbg3KdRoqCjI8048B7aHMk4wXihOLJIrSm6x8P2F8ujT9 RcGCOJri4DTDF9wM+UNjOUjYj2QFHAmaKcFXjMg7klgQKicAll15Qw9bBzjoOuX/gn4d ZPXfbd+ac/+M7lhDBN/aG7OGm+N4Pz1SKjnvoBJSUmwXHjZmwTAM00APelXsn4yPfFi6 uOcw== X-Gm-Message-State: ABUngvexkUxR6Tch9z2SO6Icm/XPD2heHrWK63FP6YPjABL2S/IOIW+rn8s7yfuYRM0V2g== X-Received: by 10.25.221.213 with SMTP id w82mr814362lfi.141.1479400818424; Thu, 17 Nov 2016 08:40:18 -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 37sm958958lfw.31.2016.11.17.08.40.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Nov 2016 08:40:17 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.87) (envelope-from ) id 1c7PjU-0002a4-NA; Thu, 17 Nov 2016 17:40:16 +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 v2 6/7] net: ethernet: ti: cpsw: add missing sanity check Date: Thu, 17 Nov 2016 17:40:03 +0100 Message-Id: <1479400804-9847-7-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1479400804-9847-1-git-send-email-johan@kernel.org> References: <1479400804-9847-1-git-send-email-johan@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 11b2daef3158..1387299030e4 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);