From patchwork Sun Apr 6 18:37:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilles Chanteperdrix X-Patchwork-Id: 337282 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 3DECE1400BE for ; Mon, 7 Apr 2014 04:53:22 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754536AbaDFSxT (ORCPT ); Sun, 6 Apr 2014 14:53:19 -0400 Received: from sd-51317.dedibox.fr ([62.210.215.82]:35620 "EHLO sd-51317.dedibox.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754388AbaDFSxR (ORCPT ); Sun, 6 Apr 2014 14:53:17 -0400 X-Greylist: delayed 928 seconds by postgrey-1.27 at vger.kernel.org; Sun, 06 Apr 2014 14:53:17 EDT Received: from men13-3-82-231-18-196.fbx.proxad.net ([82.231.18.196] helo=prometheus.local) by sd-51317.dedibox.fr with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1WWrww-0007ah-HM; Sun, 06 Apr 2014 20:37:46 +0200 From: Gilles Chanteperdrix To: Nicolas Ferre , netdev@vger.kernel.org Cc: Gilles Chanteperdrix Subject: [PATCH] net/at91_ether: avoid NULL pointer dereference Date: Sun, 6 Apr 2014 20:37:44 +0200 Message-Id: <1396809464-22471-1-git-send-email-gilles.chanteperdrix@xenomai.org> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The at91_ether driver calls macb_mii_init passing a 'struct macb' structure whose tx_clk member is initialized to 0. However, macb_handle_link_change() expects tx_clk to be the result of a call to clk_get, and so IS_ERR(tx_clk) to be true if the clock is invalid. This causes an oops when booting Linux 3.14 on the csb637 board. The following changes avoids this. Signed-off-by: Gilles Chanteperdrix Acked-by: Nicolas Ferre --- drivers/net/ethernet/cadence/at91_ether.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c index ce75de9..4a79eda 100644 --- a/drivers/net/ethernet/cadence/at91_ether.c +++ b/drivers/net/ethernet/cadence/at91_ether.c @@ -342,6 +342,9 @@ static int __init at91ether_probe(struct platform_device *pdev) } clk_enable(lp->pclk); + lp->hclk = ERR_PTR(-ENOENT); + lp->tx_clk = ERR_PTR(-ENOENT); + /* Install the interrupt handler */ dev->irq = platform_get_irq(pdev, 0); res = devm_request_irq(&pdev->dev, dev->irq, at91ether_interrupt, 0, dev->name, dev);