From: Jakub Kicinski <jakub.kicinski@netronome.com>
To: Tao Ren <taoren@fb.com>
Cc: Samuel Mendoza-Jonas <sam@mendozajonas.com>,
"David S . Miller" <davem@davemloft.net>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Joel Stanley <joel@jms.id.au>, Andrew Jeffery <andrew@aj.id.au>,
<openbmc@lists.ozlabs.org>
Subject: Re: [PATCH net] net/ncsi: handle overflow when incrementing mac address
Date: Mon, 22 Apr 2019 14:54:43 -0700 [thread overview]
Message-ID: <20190422145443.6391eaf8@cakuba.netronome.com> (raw)
In-Reply-To: <20190422172754.1011894-1-taoren@fb.com>
On Mon, 22 Apr 2019 10:27:54 -0700, 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 is fixed by detecting integer overflow when incrementing MAC
> address and adding the carry bit (if any) to the next/left bytes of the
> MAC address.
>
It'd be good to have a Fixes tag, if it's worth going to the net tree.
> Signed-off-by: Tao Ren <taoren@fb.com>
> ---
> net/ncsi/ncsi-rsp.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/net/ncsi/ncsi-rsp.c b/net/ncsi/ncsi-rsp.c
> index dc07fcc7938e..eb42bbdb7501 100644
> --- a/net/ncsi/ncsi-rsp.c
> +++ b/net/ncsi/ncsi-rsp.c
> @@ -658,7 +658,8 @@ static int ncsi_rsp_handler_oem_bcm_gma(struct ncsi_request *nr)
> const struct net_device_ops *ops = ndev->netdev_ops;
> struct ncsi_rsp_oem_pkt *rsp;
> struct sockaddr saddr;
> - int ret = 0;
> + int ret, offset;
> + u16 carry = 1;
>
> /* Get the response header */
> rsp = (struct ncsi_rsp_oem_pkt *)skb_network_header(nr->rsp);
> @@ -667,7 +668,12 @@ 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]++;
> + offset = ETH_ALEN - 1;
> + do {
> + carry += (u8)saddr.sa_data[offset];
> + saddr.sa_data[offset] = (char)carry;
> + carry = carry >> 8;
> + } while (carry != 0 && --offset >= 0);
We have eth_addr_dec(), perhaps it'd be good to add an eth_addr_inc()
equivalent? (I'm not sure if it'd have to be in net-next, it's a tiny
function, and OK for net for my taste, but I had been wrong before).
If I'm allowed to be paranoid I'd also advise checking the resulting
MAC is a valid ethernet unicast addr.
> ret = ops->ndo_set_mac_address(ndev, &saddr);
> if (ret < 0)
> netdev_warn(ndev, "NCSI: 'Writing mac address to device failed\n");
next prev parent reply other threads:[~2019-04-22 21:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-22 17:27 [PATCH net] net/ncsi: handle overflow when incrementing mac address Tao Ren
2019-04-22 21:54 ` Jakub Kicinski [this message]
2019-04-22 22:38 ` Tao Ren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190422145443.6391eaf8@cakuba.netronome.com \
--to=jakub.kicinski@netronome.com \
--cc=andrew@aj.id.au \
--cc=davem@davemloft.net \
--cc=joel@jms.id.au \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=openbmc@lists.ozlabs.org \
--cc=sam@mendozajonas.com \
--cc=taoren@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).