From patchwork Wed Apr 20 08:56:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 612548 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 3qqbNq28YKz9t5T for ; Wed, 20 Apr 2016 18:57:15 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b=IM2Jqk3G; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754947AbcDTI44 (ORCPT ); Wed, 20 Apr 2016 04:56:56 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:35314 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754926AbcDTI4x (ORCPT ); Wed, 20 Apr 2016 04:56:53 -0400 Received: by mail-wm0-f42.google.com with SMTP id e201so42099879wme.0 for ; Wed, 20 Apr 2016 01:56:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=GAXgbRbr/Mufk+e7DhcjrerebkKoOYGQw6XZzhd+UYU=; b=IM2Jqk3GchUwSlkV6JtIO25CkQqzZcA9xydZJt7yPGMHTRT1KAhLHLuMl3Q5l13atp uQJsLgExig9eYKK5VD6689bbGxaNGwMz1SBReS8k5yD5y5RrXYmZtfLbcDhRUX1wxEFt A8KhRXIYSEkEDwN4lNj6Bc7G/yriMClT7Pa1bo6oHkX0VoqjopkXTfP1dwjhB+LYfRsA lu1lFPO1Es/1V9tT8o9sTX3zT09mc41EUYbgPqkNqYTQwu+UUibNkdkC7o+5z72W/3iw yqBgwT9nVa6x5Gmr96c/EuzBe7iRgbxKULF/h8YSDikBjtsCDHVThKTOPnm0nEdiyXFe 7hFw== 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=GAXgbRbr/Mufk+e7DhcjrerebkKoOYGQw6XZzhd+UYU=; b=mPE9/mhoWxw+Cok9m2dyy9qN5iwkePucllAyTTmo5clE53joW5otUTTON7WQWXFHBA xv60c4jp3nLkbiNDt1Mn/41hEDTxvOvwezRjdKHkHNvsvh+jZdsSDae1kDemnyXflQU7 APONUCutwmGgbaHKvD7BupnxZGNqaNr3opKBWpuZD5vW2rUjZA8xPOXUMy0L7CVqkkiF sD1CD/tMOzKIRkAoameV622a1zYlOnDfYk8wQmocl+/UMQYTLFbaPL6UYeIbRv32LB0A 0Pdw5lglWv2kkFHzF6mQhqCmSlsVoXFYSWsN8iP+/9+GkyUapGy7MfTZJrjYfb7KTC87 kc5A== X-Gm-Message-State: AOPr4FXtf5OeHNTPAVTdxMJFIq7JjUIbxduorHLCdspCITDtEyk9R9VHtKKmlJK0o575BWT7 X-Received: by 10.28.99.214 with SMTP id x205mr8200855wmb.9.1461142611562; Wed, 20 Apr 2016 01:56:51 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id a202sm23902402wme.1.2016.04.20.01.56.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Apr 2016 01:56:51 -0700 (PDT) From: Neil Armstrong To: "David S. Miller" , Andrew Lunn , Tom Lendacky , Mugunthan V N , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Neil Armstrong , Brian Hutchinson Subject: [PATCH 2/2] net: ethernet: davinci_emac: Fix platform_data overwrite Date: Wed, 20 Apr 2016 10:56:45 +0200 Message-Id: <1461142605-4335-1-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When the DaVinci emac driver is removed and re-probed, the actual pdev->dev.platform_data is populated with an unwanted valid pointer saved by the previous davinci_emac_of_get_pdata() call, causing a kernel crash when calling priv->int_disable() in emac_int_disable(). Unable to handle kernel paging request at virtual address c8622a80 ... [] (emac_int_disable) from [] (emac_dev_open+0x290/0x5f8) [] (emac_dev_open) from [] (__dev_open+0xb8/0x120) [] (__dev_open) from [] (__dev_change_flags+0x88/0x14c) [] (__dev_change_flags) from [] (dev_change_flags+0x18/0x48) [] (dev_change_flags) from [] (devinet_ioctl+0x6b4/0x7ac) [] (devinet_ioctl) from [] (sock_ioctl+0x1d8/0x2c0) [] (sock_ioctl) from [] (do_vfs_ioctl+0x41c/0x600) [] (do_vfs_ioctl) from [] (SyS_ioctl+0x6c/0x7c) [] (SyS_ioctl) from [] (ret_fast_syscall+0x0/0x1c) Fixes: 42f59967a091 ("net: ethernet: davinci_emac: add OF support") Cc: Brian Hutchinson Signed-off-by: Neil Armstrong --- drivers/net/ethernet/ti/davinci_emac.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index e9fe3fb..58d58f0 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c @@ -1878,8 +1878,6 @@ davinci_emac_of_get_pdata(struct platform_device *pdev, struct emac_priv *priv) pdata->hw_ram_addr = auxdata->hw_ram_addr; } - pdev->dev.platform_data = pdata; - return pdata; }