From: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
To: Lijun Pan <ljp@linux.ibm.com>
Cc: netdev@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>
Subject: Re: [PATCH net v2] ibmvnic: fix ibmvnic_set_mac
Date: Thu, 22 Oct 2020 00:34:25 +0200 [thread overview]
Message-ID: <20201021223425.GA61349@ranger.igk.intel.com> (raw)
In-Reply-To: <20201021060712.48806-1-ljp@linux.ibm.com>
On Wed, Oct 21, 2020 at 01:07:12AM -0500, Lijun Pan wrote:
> Jakub Kicinski brought up a concern in ibmvnic_set_mac().
> ibmvnic_set_mac() does this:
>
> ether_addr_copy(adapter->mac_addr, addr->sa_data);
> if (adapter->state != VNIC_PROBED)
> rc = __ibmvnic_set_mac(netdev, addr->sa_data);
>
> So if state == VNIC_PROBED, the user can assign an invalid address to
> adapter->mac_addr, and ibmvnic_set_mac() will still return 0.
>
> The fix is to add the handling for "adapter->state == VNIC_PROBED" case,
> which saves the old mac address back to adapter->mac_addr, and
> returns an error code.
>
> Fixes: 62740e97881c ("net/ibmvnic: Update MAC address settings after adapter reset")
> Cc: Jakub Kicinski <kuba@kernel.org>
> Signed-off-by: Lijun Pan <ljp@linux.ibm.com>
> ---
> v2: change the subject from v1's
> "ibmvnic: no need to update adapter->mac_addr before it completes"
> handle adapter->state==VNIC_PROBED case in else statement.
>
> drivers/net/ethernet/ibm/ibmvnic.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
> index 4dd3625a4fbc..0d78e1e3d44c 100644
> --- a/drivers/net/ethernet/ibm/ibmvnic.c
> +++ b/drivers/net/ethernet/ibm/ibmvnic.c
> @@ -1829,8 +1829,12 @@ static int ibmvnic_set_mac(struct net_device *netdev, void *p)
>
> rc = 0;
> ether_addr_copy(adapter->mac_addr, addr->sa_data);
> - if (adapter->state != VNIC_PROBED)
> + if (adapter->state != VNIC_PROBED) {
> rc = __ibmvnic_set_mac(netdev, addr->sa_data);
> + } else {
> + ether_addr_copy(adapter->mac_addr, netdev->dev_addr);
> + rc = -EIO;
Why suddenly you want to change the behavior for case when ibmvnic_set_mac
is called for VNIC_PROBED state?
I went through the previous discussion and I have a feeling that Jakub
meant to simply call the is_valid_ether_addr() on addr->sa_data before the
first ether_addr_copy and then act accordingly based on the validity of
user supplied mac addr.
And instead of yet another write to adapter->mac_addr that you're
introducing you could just move the first ether_addr_copy (if
addr->sa_data is valid) onto the if (adapter->state != VNIC_PROBED)
condition. Right?
> + }
>
> return rc;
> }
> --
> 2.23.0
>
prev parent reply other threads:[~2020-10-21 22:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-21 6:07 [PATCH net v2] ibmvnic: fix ibmvnic_set_mac Lijun Pan
2020-10-21 22:34 ` Maciej Fijalkowski [this message]
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=20201021223425.GA61349@ranger.igk.intel.com \
--to=maciej.fijalkowski@intel.com \
--cc=kuba@kernel.org \
--cc=ljp@linux.ibm.com \
--cc=netdev@vger.kernel.org \
/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).