net: netconsole: append userdata to netconsole messages

Append userdata to outgoing unfragmented (<1000 bytes) netconsole messages.
When sending messages the userdata string is already formatted and stored
in netconsole_target->userdata_complete.

Always write the outgoing message to buf, so userdata can be appended in
a standard fashion. This is a change from only using buf when the
release needs to be prepended to the message.

Co-developed-by: Breno Leitao <leitao@debian.org>
Signed-off-by: Breno Leitao <leitao@debian.org>
Signed-off-by: Matthew Wood <thepacketgeek@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index e4d6ba0b50efe89d2d1c0cb042a2df840d487260..d53bb11723365a4d586b509e8c62d9ef2bd61cbe 100644 (file)
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -1034,19 +1034,34 @@ static void send_ext_msg_udp(struct netconsole_target *nt, const char *msg,
        const char *msg_ready = msg;
        const char *release;
        int release_len = 0;
+       int userdata_len = 0;
+       char *userdata = NULL;
+
+#ifdef CONFIG_NETCONSOLE_DYNAMIC
+       userdata = nt->userdata_complete;
+       userdata_len = nt->userdata_length;
+#endif
 
        if (nt->release) {
                release = init_utsname()->release;
                release_len = strlen(release) + 1;
        }
 
-       if (msg_len + release_len <= MAX_PRINT_CHUNK) {
+       if (msg_len + release_len + userdata_len <= MAX_PRINT_CHUNK) {
                /* No fragmentation needed */
                if (nt->release) {
                        scnprintf(buf, MAX_PRINT_CHUNK, "%s,%s", release, msg);
                        msg_len += release_len;
-                       msg_ready = buf;
+               } else {
+                       memcpy(buf, msg, msg_len);
                }
+
+               if (userdata)
+                       msg_len += scnprintf(&buf[msg_len],
+                                            MAX_PRINT_CHUNK - msg_len,
+                                            "%s", userdata);
+
+               msg_ready = buf;
                netpoll_send_udp(&nt->np, msg_ready, msg_len);
                return;
        }