From patchwork Wed Apr 24 01:28:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tao Ren X-Patchwork-Id: 1089850 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=fb.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=fb.com header.i=@fb.com header.b="BLkN3X/9"; dkim=pass (1024-bit key; unprotected) header.d=fb.onmicrosoft.com header.i=@fb.onmicrosoft.com header.b="UdridE4U"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44pjQY6pF5z9sNB for ; Wed, 24 Apr 2019 11:29:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729115AbfDXB3E (ORCPT ); Tue, 23 Apr 2019 21:29:04 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:34380 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728773AbfDXB3E (ORCPT ); Tue, 23 Apr 2019 21:29:04 -0400 Received: from pps.filterd (m0001255.ppops.net [127.0.0.1]) by mx0b-00082601.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x3O1QQHu012036; Tue, 23 Apr 2019 18:28:45 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : content-type : content-transfer-encoding : mime-version; s=facebook; bh=w/7Yyr6lXJ+r2wdtn/ocpRUunhMgkW2lJF/webwfUIc=; b=BLkN3X/9BLlwA/Wcx/vqAUsRYGblklFpRnhNnDNYQkzvoGmEHPA8NHKz1GHog9Y+458S Br44s5fcC1hgVzpT9zd/qqguVPbQuW/CNRU8um8sJiGxYv1g1AGHeEfxsxWeNAaSpcbn qWVKHfhq+e/tlTg6WR09uJ87TA2hGMFTnWs= Received: from mail.thefacebook.com (mailout.thefacebook.com [199.201.64.23]) by mx0b-00082601.pphosted.com with ESMTP id 2s27u3shha-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 23 Apr 2019 18:28:44 -0700 Received: from prn-mbx06.TheFacebook.com (2620:10d:c081:6::20) by prn-hub04.TheFacebook.com (2620:10d:c081:35::128) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.1.1713.5; Tue, 23 Apr 2019 18:28:43 -0700 Received: from prn-hub06.TheFacebook.com (2620:10d:c081:35::130) by prn-mbx06.TheFacebook.com (2620:10d:c081:6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.1.1713.5; Tue, 23 Apr 2019 18:28:43 -0700 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (192.168.54.28) by o365-in.thefacebook.com (192.168.16.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.1.1713.5 via Frontend Transport; Tue, 23 Apr 2019 18:28:43 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.onmicrosoft.com; s=selector1-fb-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=w/7Yyr6lXJ+r2wdtn/ocpRUunhMgkW2lJF/webwfUIc=; b=UdridE4Uqt/qcWA1rQ0/q7gmqoiwJpK7qyyVYuN9leuTz2x00EenWMKkRug7cpwWRhtG/J2fOK+38jSaucVfJL59sNKToqOwE5vz4BgOHXsLnokEUeuX1bO3yc+uNgpTBR8CgiQZ9MLPupwSwFuP0Z4KrvvmT3zOaDRAwyFuBPE= Received: from MWHPR15MB1216.namprd15.prod.outlook.com (10.175.2.146) by MWHPR15MB1839.namprd15.prod.outlook.com (10.174.255.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1813.14; Wed, 24 Apr 2019 01:28:41 +0000 Received: from MWHPR15MB1216.namprd15.prod.outlook.com ([fe80::9ccc:f6fa:40e2:f1cd]) by MWHPR15MB1216.namprd15.prod.outlook.com ([fe80::9ccc:f6fa:40e2:f1cd%10]) with mapi id 15.20.1813.017; Wed, 24 Apr 2019 01:28:41 +0000 From: Tao Ren To: "David S . Miller" , Maxim Mikityanskiy , Bartosz Golaszewski , Samuel Mendoza-Jonas , Jakub Kicinski , Joel Stanley , Andrew Jeffery , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "openbmc@lists.ozlabs.org" CC: Tao Ren Subject: [PATCH net v3] net/ncsi: handle overflow when incrementing mac address Thread-Topic: [PATCH net v3] net/ncsi: handle overflow when incrementing mac address Thread-Index: AQHU+j0M9s4jWyUgckSZ8ZAgrSQZoQ== Date: Wed, 24 Apr 2019 01:28:41 +0000 Message-ID: <20190424012819.2833-1-taoren@fb.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MWHPR12CA0041.namprd12.prod.outlook.com (2603:10b6:301:2::27) To MWHPR15MB1216.namprd15.prod.outlook.com (2603:10b6:320:23::18) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [2620:10d:c090:200::5189] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5c69465e-5d36-4998-dfe1-08d6c8542eb6 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(2017052603328)(7193020); SRVR:MWHPR15MB1839; x-ms-traffictypediagnostic: MWHPR15MB1839: x-microsoft-antispam-prvs: x-forefront-prvs: 00179089FD x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(346002)(376002)(366004)(396003)(39860400002)(199004)(189003)(6486002)(6436002)(86362001)(2201001)(1076003)(256004)(68736007)(97736004)(186003)(36756003)(14444005)(71200400001)(71190400001)(2616005)(476003)(52116002)(6116002)(316002)(66946007)(486006)(14454004)(386003)(110136005)(2501003)(6506007)(8676002)(46003)(4326008)(73956011)(102836004)(25786009)(478600001)(7736002)(6512007)(8936002)(66476007)(81156014)(53936002)(66446008)(64756008)(81166006)(66556008)(2906002)(99286004)(5660300002)(305945005)(50226002)(7416002)(921003)(1121003); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR15MB1839; H:MWHPR15MB1216.namprd15.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: fb.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: TsJq1u6HLLgfiSR0NJVemU/jGJAuY0/erwqf5W9dUx4CYn5I+j5Uly3S+Wfvh2mx3nuT2cmT3Ghv8IXYYVeKGuerZYZno42oKsuzt3tvD2E3jqq0yisZRi6MBXWM/XJR60OwCw6PN2G9Vx0nvZO3aVBZTDaJwUzcC9HIvU/vTEYd9ZKHp+gBlCafSgQB+QqGfH5YbfRTDDpUZGs5C5hZw9OqeZw6dcCI6J7ZZAjtXaqZaLX+7zF9hCsrXd3ixjj8l7r7+Ks5K7WxgrgDTT7UlN8ZXEpY4U3/9jvZma5dkTwEPG930eRX/wIQv+p09ZuaBiQ8kReoCjKSWd0KuYLu8uhfDi70fE30PA4g27cZ+r3taOObii4SSK4J69TJCURW1iecXS+wlxByzke5ucsjAumnstBc+KK1h0XFoipTt6c= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 5c69465e-5d36-4998-dfe1-08d6c8542eb6 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Apr 2019 01:28:41.1553 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR15MB1839 X-OriginatorOrg: fb.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-04-24_01:, , signatures=0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- include/linux/etherdevice.h | 15 +++++++++++++-- net/ncsi/ncsi-rsp.c | 6 +++++- 2 files changed, 18 insertions(+), 3 deletions(-) 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..ac5ca754e362 100644 --- a/include/linux/etherdevice.h +++ b/include/linux/etherdevice.h @@ -436,8 +436,7 @@ static inline void u64_to_ether_addr(u64 u, u8 *addr) } /** - * eth_addr_dec - Decrement the given MAC address - * + * eth_addr_dec() - Decrement the given MAC address * @addr: Pointer to a six-byte array containing Ethernet address to decrement */ static inline void eth_addr_dec(u8 *addr) @@ -448,6 +447,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");