netdev - Re: [PATCH net v2 1/4] bonding: add bond_ether

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 14 Mar 2023 17:08:18 +0200
From:   Nikolay Aleksandrov <razor@...ckwall.org>
To:     Michal Kubiak <michal.kubiak@...el.com>
Cc:     netdev@...r.kernel.org, monis@...taire.com, syoshida@...hat.com,
        j.vosburgh@...il.com, andy@...yhouse.net, kuba@...nel.org,
        davem@...emloft.net, pabeni@...hat.com, edumazet@...gle.com,
        syzbot+9dfc3f3348729cc82277@...kaller.appspotmail.com
Subject: Re: [PATCH net v2 1/4] bonding: add bond_ether_setup helper

On 14/03/2023 16:58, Michal Kubiak wrote:
> On Tue, Mar 14, 2023 at 01:14:23PM +0200, Nikolay Aleksandrov wrote:
>> Add bond_ether_setup helper which will be used in the following patches
>> to fix all ether_setup() calls in the bonding driver. It takes care of both
>> IFF_MASTER and IFF_SLAVE flags, the former is always restored and the
>> latter only if it was set.
>>
>> Fixes: e36b9d16c6a6d ("bonding: clean muticast addresses when device changes type")
>> Fixes: 7d5cd2ce5292 ("bonding: correctly handle bonding type change on enslave failure")
>> Signed-off-by: Nikolay Aleksandrov <razor@...ckwall.org>
>> ---
>>  drivers/net/bonding/bond_main.c | 12 ++++++++++++
>>  1 file changed, 12 insertions(+)
>>
>> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
>> index 00646aa315c3..d41024ad2c18 100644
>> --- a/drivers/net/bonding/bond_main.c
>> +++ b/drivers/net/bonding/bond_main.c
>> @@ -1775,6 +1775,18 @@ void bond_lower_state_changed(struct slave *slave)
>>  		slave_err(bond_dev, slave_dev, "Error: %s\n", errmsg);	\
>>  } while (0)
>>  
>> +/* ether_setup() resets bond_dev's flags so we always have to restore
>> + * IFF_MASTER, and only restore IFF_SLAVE if it was set
>> + */
> 
> I would suggest using the kernel pattern for function documentation.
> At first glance, the name "ether_setup" at the beginning is easy to be
> confused with the function name (bond_ether_setup).
> 

This is an internal helper, I don't think it needs a full kernel doc.

>> +static void bond_ether_setup(struct net_device *bond_dev)
>> +{
>> +	unsigned int slave_flag = bond_dev->flags & IFF_SLAVE;
>> +
>> +	ether_setup(bond_dev);
>> +	bond_dev->flags |= IFF_MASTER | slave_flag;
>> +	bond_dev->priv_flags &= ~IFF_TX_SKB_SHARING;
>> +}
>> +
>>  /* enslave device <slave> to bond device <master> */
>>  int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,
>>  		 struct netlink_ext_ack *extack)
> 
> It seems you never call this newly added helper in the current patch. I
> think it creates a compilation warning ("defined but not used").
> Please add your function in the patch where you actually use it.
> 

I'm adding the helper in a separate patch to emphasize it and focus the review.
I have written in the commit message that the next two fixes will be using it.
IMO, this should be ok.

>> -- 
>> 2.39.2
>>
> 
> 
> Thanks,
> Michal

Cheers,
 Nik