From patchwork Thu Jan 15 01:41:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: 'Kukjin Kim' X-Patchwork-Id: 429171 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 623E11401AF for ; Thu, 15 Jan 2015 12:42:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751363AbbAOBlq (ORCPT ); Wed, 14 Jan 2015 20:41:46 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:26702 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750826AbbAOBlp (ORCPT ); Wed, 14 Jan 2015 20:41:45 -0500 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NI700DQV3DJAQ80@mailout4.samsung.com> for netdev@vger.kernel.org; Thu, 15 Jan 2015 10:41:43 +0900 (KST) X-AuditID: cbfee61a-f79c06d000004e71-20-54b71ad741d6 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id D6.D3.20081.7DA17B45; Thu, 15 Jan 2015 10:41:43 +0900 (KST) Received: from kindness.dsn.sec.samsung.com ([12.36.165.106]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NI7005BS3DGO180@mmp1.samsung.com>; Thu, 15 Jan 2015 10:41:43 +0900 (KST) From: Kukjin Kim To: netdev@vger.kernel.org Cc: Dave Miller , "Girish K.S" , Byungho An , Kukjin Kim Subject: [PATCH] net: sxgbe: Fix NULL dereferece when using DT Date: Thu, 15 Jan 2015 10:41:47 +0900 Message-id: <1421286107-9514-1-git-send-email-kgene@kernel.org> X-Mailer: git-send-email 1.7.4.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrOJMWRmVeSWpSXmKPExsVy+t9jAd3rUttDDJavM7O4eu4Yo8WiN7oW /Y9fM1vMP7qDyeLYAjEHVo+WjR/YPDat6mTz6NuyitHj8ya5AJYoLpuU1JzMstQifbsErozV X7vZCyZxV/S2/2VrYFzJ2cXIySEhYCLx9fs2NghbTOLCvfVgtpDAIkaJoxe0uhi5gOweJokL M44ydzFycLAJKEs0NumD1IgISEl83LGdHaSGWaCbUeLNirlMIDXCAnYS13Z4g5gsAqoSj7Zk gpi8AvYSL/Z5QWxSkDg29SvrBEbuBYwMqxhFUwuSC4qT0nMN9YoTc4tL89L1kvNzNzGCvf9M agfjygaLQ4wCHIxKPLwOR7aGCLEmlhVX5h5ilOBgVhLhfftpW4gQb0piZVVqUX58UWlOavEh RmkOFiVxXiX7thAhgfTEktTs1NSC1CKYLBMHp1QDo++OR0lH/2Udc70UZ5f1u+5n9OcpjGdm bBR80/H5QE+Rr8Dn2277399ftmj6rMAdTzN4Il9xWTLzbHl2dF/X1ksNlXceOW3dc593o16m 5J78PcWt0973RG8NZDxcu+Fas83hPR902c/+1MvbqL742I8DnBUFr9kcuZ4JlX5ZvHv3cdn8 ebfd18srsRRnJBpqMRcVJwIAIv8dNvoBAAA= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Girish K.S When the MAC address is provided in the device tree file, the condition is true and kernel crashes due to NULL dereference. Signed-off-by: Girish K.S Signed-off-by: Byungho An Signed-off-by: Kukjin Kim --- drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c index 866560e..b02eed1 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c @@ -108,10 +108,6 @@ static int sxgbe_platform_probe(struct platform_device *pdev) } } - /* Get MAC address if available (DT) */ - if (mac) - ether_addr_copy(priv->dev->dev_addr, mac); - priv = sxgbe_drv_probe(&(pdev->dev), plat_dat, addr); if (!priv) { pr_err("%s: main driver probe failed\n", __func__); @@ -125,6 +121,10 @@ static int sxgbe_platform_probe(struct platform_device *pdev) goto err_drv_remove; } + /* Get MAC address if available (DT) */ + if (mac) + ether_addr_copy(priv->dev->dev_addr, mac); + /* Get the TX/RX IRQ numbers */ for (i = 0, chan = 1; i < SXGBE_TX_QUEUES; i++) { priv->txq[i]->irq_no = irq_of_parse_and_map(node, chan++);