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  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:   Sun, 23 Aug 2020 17:55:13 +0200
From:   Michal Kubecek <mkubecek@...e.cz>
To:     Maxim Mikityanskiy <maximmi@...lanox.com>
Cc:     "David S. Miller" <davem@...emloft.net>,
        Andrew Lunn <andrew@...n.ch>, Jakub Kicinski <kuba@...nel.org>,
        netdev@...r.kernel.org
Subject: Re: [PATCH ethtool 1/2] netlink: Fix the condition for displaying
 actual changes

On Fri, Aug 14, 2020 at 04:17:44PM +0300, Maxim Mikityanskiy wrote:
> This comment in the code:
> 
>     /* result is not exactly as requested, show differences */
> 
> implies that the "Actual changes" output should be displayed only if the
> result is not as requested, which matches the legacy ethtool behavior.
> However, in fact, ethtool-netlink displays "actual changes" even when
> the changes are expected (e.g., one bit was requested, and it was
> changed as requested).
> 
> This commit fixes the condition above to make the behavior match the
> description in the comment and the behavior of the legacy ethtool. The
> new condition excludes the req_mask bits from active_mask to avoid
> reacting on bit changes that we asked for. The new condition now
> matches the ifs in the loop above that print "[requested on/off]" and
> "[not requested]".
> 
> Signed-off-by: Maxim Mikityanskiy <maximmi@...lanox.com>

Applied, thank you.

Michal

> ---
>  netlink/features.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/netlink/features.c b/netlink/features.c
> index 8b5b858..133529d 100644
> --- a/netlink/features.c
> +++ b/netlink/features.c
> @@ -413,7 +413,7 @@ static void show_feature_changes(struct nl_context *nlctx,
>  
>  	diff = false;
>  	for (i = 0; i < words; i++)
> -		if (wanted_mask[i] || active_mask[i])
> +		if (wanted_mask[i] || (active_mask[i] & ~sfctx->req_mask[i]))
>  			diff = true;
>  	if (!diff)
>  		return;
> -- 
> 2.21.0
> 

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)

Powered by blists - more mailing lists