netdev - Re: [PATCH] net: marvell: Use min() instead of doing it manually

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, 1 Mar 2022 08:33:39 +0100
From:   Heiner Kallweit <hkallweit1@...il.com>
To:     Haowen Bai <baihaowen88@...il.com>,
        sebastian.hesselbarth@...il.com, davem@...emloft.net,
        kuba@...nel.org
Cc:     netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] net: marvell: Use min() instead of doing it manually

On 01.03.2022 07:16, Haowen Bai wrote:
> Fix following coccicheck warning:
> drivers/net/ethernet/marvell/mv643xx_eth.c:1664:35-36: WARNING opportunity for min()
> 
> Signed-off-by: Haowen Bai <baihaowen88@...il.com>
> ---
>  drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
> index 143ca8b..1018b9e 100644
> --- a/drivers/net/ethernet/marvell/mv643xx_eth.c
> +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
> @@ -1661,7 +1661,7 @@ mv643xx_eth_set_ringparam(struct net_device *dev, struct ethtool_ringparam *er,
>  	if (er->rx_mini_pending || er->rx_jumbo_pending)
>  		return -EINVAL;
>  
> -	mp->rx_ring_size = er->rx_pending < 4096 ? er->rx_pending : 4096;
> +	mp->rx_ring_size = min(er->rx_pending, 4096);

Did you test this? Supposedly it won't compile cleanly due to the
min macro type checking (rx_pending is __u32, 4096 is int).

>  	mp->tx_ring_size = clamp_t(unsigned int, er->tx_pending,
>  				   MV643XX_MAX_SKB_DESCS * 2, 4096);
>  	if (mp->tx_ring_size != er->tx_pending)