| Message ID | 20220321023155.106066-1-morbo@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 4723832fa63f30c85cce3739b0497e4e193f684b |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | bnx2x: truncate value to original sizing | expand |
Hello: This patch was applied to netdev/net-next.git (master) by Paolo Abeni <pabeni@redhat.com>: On Sun, 20 Mar 2022 19:31:55 -0700 you wrote: > The original behavior was to print out unsigned short or unsigned char > values. The change in commit d65aea8e8298 ("bnx2x: use correct format > characters") prints out the whole value if not truncated. So truncate > the value to an unsigned {short|char} to retain the original behavior. > > Fixes: d65aea8e8298 ("bnx2x: use correct format characters") > Link: https://github.com/ClangBuiltLinux/linux/issues/378 > Signed-off-by: Bill Wendling <morbo@google.com> > > [...] Here is the summary with links: - bnx2x: truncate value to original sizing https://git.kernel.org/netdev/net-next/c/4723832fa63f You are awesome, thank you!
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c index bede16760388..7071604f9984 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c @@ -6178,7 +6178,8 @@ static int bnx2x_format_ver(u32 num, u8 *str, u16 *len) return -EINVAL; } - ret = scnprintf(str, *len, "%x.%x", num >> 16, num); + ret = scnprintf(str, *len, "%x.%x", (num >> 16) & 0xFFFF, + num & 0xFFFF); *len -= ret; return 0; } @@ -6193,7 +6194,8 @@ static int bnx2x_3_seq_format_ver(u32 num, u8 *str, u16 *len) return -EINVAL; } - ret = scnprintf(str, *len, "%x.%x.%x", num >> 16, num >> 8, num); + ret = scnprintf(str, *len, "%x.%x.%x", (num >> 16) & 0xFF, + (num >> 8) & 0xFF, num & 0xFF); *len -= ret; return 0; }
The original behavior was to print out unsigned short or unsigned char values. The change in commit d65aea8e8298 ("bnx2x: use correct format characters") prints out the whole value if not truncated. So truncate the value to an unsigned {short|char} to retain the original behavior. Fixes: d65aea8e8298 ("bnx2x: use correct format characters") Link: https://github.com/ClangBuiltLinux/linux/issues/378 Signed-off-by: Bill Wendling <morbo@google.com> --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)