From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 738C6C433DF for ; Thu, 28 May 2020 11:59:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4B0B4215A4 for ; Thu, 28 May 2020 11:59:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590667192; bh=0l8c9k+8yFocyzIgv8IfzIQTVYUyVs5GizGv3/sGW/A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=R3cexGYtR6vLpqH9HTGvKu7Ahhlq2Rfauv12uF/SjCE7IEXPdjts2sZ1o7KXCUL3l Lh9lP4qPZpvdKCDX302aXsnvNgMSsZf5guINUo3634gZcPozo0a02ZATJf2K1cC2oV 87VH5xk8gi3SrmZ5l8r7MDNp9TwUn43Msvoj6fCI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389350AbgE1L7l (ORCPT ); Thu, 28 May 2020 07:59:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:51188 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389201AbgE1L6Q (ORCPT ); Thu, 28 May 2020 07:58:16 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 32E8321919; Thu, 28 May 2020 11:58:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590667096; bh=0l8c9k+8yFocyzIgv8IfzIQTVYUyVs5GizGv3/sGW/A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SaJGAcrmkkm749VAvEQXnH4KjskdCkFwRC6Cnm5B/lO43+odP9oT6Rj4d8uV2Coz0 yXjWWslnt+eGtia+kWBJQSzKCxeLvb3wCN2/V5jXUdvweaUTDSfaJtmbbxTFfBKeSA wqOWsgmAzWE1x/6MQkt9IWc3sy5ZNzB76EPWwn4Q= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jeremy Kerr , Stan Johnson , Finn Thain , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 3/7] net: bmac: Fix read of MAC address from ROM Date: Thu, 28 May 2020 07:58:07 -0400 Message-Id: <20200528115811.1406810-3-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200528115811.1406810-1-sashal@kernel.org> References: <20200528115811.1406810-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jeremy Kerr [ Upstream commit ef01cee2ee1b369c57a936166483d40942bcc3e3 ] In bmac_get_station_address, We're reading two bytes at a time from ROM, but we do that six times, resulting in 12 bytes of read & writes. This means we will write off the end of the six-byte destination buffer. This change fixes the for-loop to only read/write six bytes. Based on a proposed fix from Finn Thain . Signed-off-by: Jeremy Kerr Reported-by: Stan Johnson Tested-by: Stan Johnson Reported-by: Finn Thain Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/apple/bmac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/apple/bmac.c b/drivers/net/ethernet/apple/bmac.c index a65d7a60f116..ffa7e7e6d18d 100644 --- a/drivers/net/ethernet/apple/bmac.c +++ b/drivers/net/ethernet/apple/bmac.c @@ -1187,7 +1187,7 @@ bmac_get_station_address(struct net_device *dev, unsigned char *ea) int i; unsigned short data; - for (i = 0; i < 6; i++) + for (i = 0; i < 3; i++) { reset_and_select_srom(dev); data = read_srom(dev, i + EnetAddressOffset/2, SROMAddressBits); -- 2.25.1