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=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 2A6D5C10F11 for ; Wed, 24 Apr 2019 03:49:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DABF020674 for ; Wed, 24 Apr 2019 03:49:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="DY3zWe4J"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="z8n6nZAY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728983AbfDXDta (ORCPT ); Tue, 23 Apr 2019 23:49:30 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:50295 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726920AbfDXDta (ORCPT ); Tue, 23 Apr 2019 23:49:30 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 824E1205B8; Tue, 23 Apr 2019 23:49:27 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 23 Apr 2019 23:49:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= mendozajonas.com; h=message-id:subject:from:to:date:in-reply-to :references:content-type:mime-version:content-transfer-encoding; s=fm2; bh=TMK4saVMes0u+ASfn2Ds/1ITfBfjKM5mlrv8N7Sg0M8=; b=DY3zW e4JAoM2pHOihbCulxIzmOizA6AV6drKcrS6XRFVT8ps+cahyw4vPdiGCW+DXu1y8 jQ5jeC6pPVFX+AB3E+uYDXOp758r5Lf7ScQkT1tdowwdb7m6gwLU5nKbfBGkc2VA N1JH4O3OJEPuZl+RjCU30ihWJ/4pFs/Si8mUgjIcyBC98T5LsflIaaSJk4dY5hpO v+cguuCb/4oXnTFWlxIWxfSXUNMc71WzRbfSPx9ezX7Wqmd5cMEbNHdrQWiT4bgZ Az8I3yxV5xgdQRIPz1ZFKk7XJle9yXLm64iIiZOHpZlnM/v/77k8r8VqqPk831yh vxDwN5SmYnFeX6IxQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; bh=TMK4saVMes0u+ASfn2Ds/1ITfBfjKM5mlrv8N7Sg0 M8=; b=z8n6nZAYEUUvQxCg9RtP3SU80RiE6IY2DsjeenGNz4xEJfUTByaSe3quh F4gkgR27hV+WhbOJeVj59jEKfIIqVvSdBVCzK7+Armv9mNgHuohRpACIHjt8bt3/ 2vyQpb/yEIpiVEDccDUbGPS6U6tpz4E/3RBYZsuuCSFMzjHQcxYL1nLZbTm8ZL6w oM3KkuQIJuf70o2r1Tc5dFZt3qs38qcf4Gbf9QyqFlJJMMSeZ2MK5Z6xDF4x7Niu woOiXdaaWMmaX5l14sXnNAqCEhmFecYmM3jKtUtnpsNDB9zIL2gZllE0INkn+P8i AEvLdR80mkojrdHyHgHcjfpGaye5w== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrgeelgdejhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefkuffhvfffjghftggfggfgsehtjeertddtreejnecuhfhrohhmpefurghmuhgv lhcuofgvnhguohiirgdqlfhonhgrshcuoehsrghmsehmvghnughoiigrjhhonhgrshdrtg homheqnecukfhppeduvddvrdelledrkedvrddutdenucfrrghrrghmpehmrghilhhfrhho mhepshgrmhesmhgvnhguohiirghjohhnrghsrdgtohhmnecuvehluhhsthgvrhfuihiivg eptd X-ME-Proxy: Received: from v4 (unknown [122.99.82.10]) by mail.messagingengine.com (Postfix) with ESMTPA id 03182E424F; Tue, 23 Apr 2019 23:49:21 -0400 (EDT) Message-ID: Subject: Re: [PATCH net v4] net/ncsi: handle overflow when incrementing mac address From: Samuel Mendoza-Jonas To: Tao Ren , "David S . Miller" , Maxim Mikityanskiy , Bartosz Golaszewski , Jakub Kicinski , Joel Stanley , Andrew Jeffery , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "openbmc@lists.ozlabs.org" Date: Wed, 24 Apr 2019 13:49:17 +1000 In-Reply-To: <20190424014310.24253-1-taoren@fb.com> References: <20190424014310.24253-1-taoren@fb.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2019-04-24 at 01:43 +0000, Tao Ren wrote: > Previously BMC's MAC address is calculated by simply adding 1 to the > last byte of network controller's MAC address, and it produces incorrect > result when network controller's MAC address ends with 0xFF. > > The problem can be fixed by calling eth_addr_inc() function to increment > MAC address; besides, the MAC address is also validated before assigning > to BMC. > > Fixes: cb10c7c0dfd9 ("net/ncsi: Add NCSI Broadcom OEM command") > Signed-off-by: Tao Ren Acked-by: Samuel Mendoza-Jonas > --- > include/linux/etherdevice.h | 12 ++++++++++++ > net/ncsi/ncsi-rsp.c | 6 +++++- > 2 files changed, 17 insertions(+), 1 deletion(-) > > Changes in v4: > - revert the changes in eth_addr_dec() function comment. > Changes in v3: > - squash changes in "etherdevice.h" into this patch. > - fix format issue in function comment. > Changes in v2: > - increment MAC address by calling eth_addr_inc() function. > - validate MAC address before assigning to BMC. > > diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h > index e2f3b21cd72a..aa8bfd6f738c 100644 > --- a/include/linux/etherdevice.h > +++ b/include/linux/etherdevice.h > @@ -448,6 +448,18 @@ static inline void eth_addr_dec(u8 *addr) > u64_to_ether_addr(u, addr); > } > > +/** > + * eth_addr_inc() - Increment the given MAC address. > + * @addr: Pointer to a six-byte array containing Ethernet address to increment. > + */ > +static inline void eth_addr_inc(u8 *addr) > +{ > + u64 u = ether_addr_to_u64(addr); > + > + u++; > + u64_to_ether_addr(u, addr); > +} > + > /** > * is_etherdev_addr - Tell if given Ethernet address belongs to the device. > * @dev: Pointer to a device structure > diff --git a/net/ncsi/ncsi-rsp.c b/net/ncsi/ncsi-rsp.c > index dc07fcc7938e..802db01e3075 100644 > --- a/net/ncsi/ncsi-rsp.c > +++ b/net/ncsi/ncsi-rsp.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > #include > > #include > @@ -667,7 +668,10 @@ static int ncsi_rsp_handler_oem_bcm_gma(struct ncsi_request *nr) > ndev->priv_flags |= IFF_LIVE_ADDR_CHANGE; > memcpy(saddr.sa_data, &rsp->data[BCM_MAC_ADDR_OFFSET], ETH_ALEN); > /* Increase mac address by 1 for BMC's address */ > - saddr.sa_data[ETH_ALEN - 1]++; > + eth_addr_inc((u8 *)saddr.sa_data); > + if (!is_valid_ether_addr((const u8 *)saddr.sa_data)) > + return -ENXIO; > + > ret = ops->ndo_set_mac_address(ndev, &saddr); > if (ret < 0) > netdev_warn(ndev, "NCSI: 'Writing mac address to device failed\n"); > -- > 2.17.1 >