From patchwork Sat Mar 3 17:01:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: santosh nayak X-Patchwork-Id: 144446 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 CFB051007D6 for ; Sun, 4 Mar 2012 04:02:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753935Ab2CCRCc (ORCPT ); Sat, 3 Mar 2012 12:02:32 -0500 Received: from mail-pz0-f52.google.com ([209.85.210.52]:62984 "EHLO mail-pz0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753357Ab2CCRCb (ORCPT ); Sat, 3 Mar 2012 12:02:31 -0500 Received: by dadp12 with SMTP id p12so3149417dad.11 for ; Sat, 03 Mar 2012 09:02:31 -0800 (PST) Received-SPF: pass (google.com: domain of santoshprasadnayak@gmail.com designates 10.68.130.72 as permitted sender) client-ip=10.68.130.72; Authentication-Results: mr.google.com; spf=pass (google.com: domain of santoshprasadnayak@gmail.com designates 10.68.130.72 as permitted sender) smtp.mail=santoshprasadnayak@gmail.com; dkim=pass header.i=santoshprasadnayak@gmail.com Received: from mr.google.com ([10.68.130.72]) by 10.68.130.72 with SMTP id oc8mr29860139pbb.115.1330794150995 (num_hops = 1); Sat, 03 Mar 2012 09:02:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=yadZG+VCTYIQ9FxUjm3NJgrg4zn8vjhnNE8fhGVOGj8=; b=Ino4pQg4ibTY8Y13jSa7GyUlntk2MJSv2jJPh9XLHNn5GPIASp/k3Qnfhmako+uZvQ 0R/YXC5g78Ib/9xGLvkxTLL/y5nFk9AZZLy0TXACfqQZLhjLfZUv0MfJZ8sewynxFu5Q xcQip5KJWAXkVEn82PXgIaXssA9UibHkSHdZI578HYqj3CcqmhiuAlDet2l7TcKEaJBL NL+OG/Y2sbrNCxNFWbS+fRrZXmcvzh7O7AibcQXaxlBWNVz1s5Dxj+WzP9Mh3tyx9VMW q7NZEMSDQ/eLELaAbqvUUDrocFAFYePyXevmY8y3/ZR2mLMqqcGTyI9gEdZtrkEo140Q t6Xg== Received: by 10.68.130.72 with SMTP id oc8mr25281522pbb.115.1330794150833; Sat, 03 Mar 2012 09:02:30 -0800 (PST) Received: from localhost.localdomain ([115.118.150.172]) by mx.google.com with ESMTPS id s1sm8225114pbs.21.2012.03.03.09.02.27 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 03 Mar 2012 09:02:30 -0800 (PST) From: santosh nayak To: sony.chacko@qlogic.com Cc: rajesh.borundia@qlogic.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Santosh Nayak Subject: [PATCH] netxen: memory corruption by netxen_p3_get_mac_addr. Date: Sat, 3 Mar 2012 22:31:27 +0530 Message-Id: <1330794087-19248-1-git-send-email-santoshprasadnayak@gmail.com> X-Mailer: git-send-email 1.7.4.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Santosh Nayak 'mac_hi' and 'mac_lo' are 32 bit unsinged int but we are modifing 64 bit of memory during mac calculation. To fix this issue define a local variable of 64 bit and do mac calculation. Remove 'le64_to_cpu' to fix endian issue. Signed-off-by: Santosh Nayak --- drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c index 0f81287..7ea930b 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c @@ -1069,7 +1069,8 @@ int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, u64 *mac) int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, u64 *mac) { - uint32_t crbaddr, mac_hi, mac_lo; + uint32_t crbaddr; + u64 mac_hi, mac_lo; int pci_func = adapter->ahw.pci_func; crbaddr = CRB_MAC_BLOCK_START + @@ -1079,9 +1080,9 @@ int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, u64 *mac) mac_hi = NXRD32(adapter, crbaddr+4); if (pci_func & 1) - *mac = le64_to_cpu((mac_lo >> 16) | ((u64)mac_hi << 16)); + *mac = (mac_lo >> 16) | (mac_hi << 16); else - *mac = le64_to_cpu((u64)mac_lo | ((u64)mac_hi << 32)); + *mac = mac_lo | (mac_hi << 32); return 0; }