Commit d94785bb authored by Breno Leitao's avatar Breno Leitao Committed by Jakub Kicinski

net: netconsole: fix wrong warning

A warning is triggered when there is insufficient space in the buffer
for userdata. However, this is not an issue since userdata will be sent
in the next iteration.

Current warning message:

    ------------[ cut here ]------------
     WARNING: CPU: 13 PID: 3013042 at drivers/net/netconsole.c:1122 write_ext_msg+0x3b6/0x3d0
      ? write_ext_msg+0x3b6/0x3d0
      console_flush_all+0x1e9/0x330

The code incorrectly issues a warning when this_chunk is zero, which is
a valid scenario. The warning should only be triggered when this_chunk
is negative.

Fixes: 1ec9daf9 ("net: netconsole: append userdata to fragmented netconsole messages")
Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20241008094325.896208-1-leitao@debian.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8c924369
...@@ -1161,8 +1161,14 @@ static void send_ext_msg_udp(struct netconsole_target *nt, const char *msg, ...@@ -1161,8 +1161,14 @@ static void send_ext_msg_udp(struct netconsole_target *nt, const char *msg,
this_chunk = min(userdata_len - sent_userdata, this_chunk = min(userdata_len - sent_userdata,
MAX_PRINT_CHUNK - preceding_bytes); MAX_PRINT_CHUNK - preceding_bytes);
if (WARN_ON_ONCE(this_chunk <= 0)) if (WARN_ON_ONCE(this_chunk < 0))
/* this_chunk could be zero if all the previous
* message used all the buffer. This is not a
* problem, userdata will be sent in the next
* iteration
*/
return; return;
memcpy(buf + this_header + this_offset, memcpy(buf + this_header + this_offset,
userdata + sent_userdata, userdata + sent_userdata,
this_chunk); this_chunk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment