This is a note to let you know that I've just added the patch titled
mptcp: print new line in mptcp_seq_show() if mptcp isn't in use
to the 5.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mptcp-print-new-line-in-mptcp_seq_show-if-mptcp-isn-t-in-use.patch
and it can be found in the queue-5.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Sat Dec 19 11:38:43 AM CET 2020
From: Jianguo Wu <wujianguo@xxxxxxxxxxxxxxx>
Date: Sat, 5 Dec 2020 15:56:33 +0800
Subject: mptcp: print new line in mptcp_seq_show() if mptcp isn't in use
From: Jianguo Wu <wujianguo@xxxxxxxxxxxxxxx>
[ Upstream commit f55628b3e7648198e9c072b52080c5dea8678adf ]
When do cat /proc/net/netstat, the output isn't append with a new line, it looks like this:
[root@localhost ~]# cat /proc/net/netstat
...
MPTcpExt: 0 0 0 0 0 0 0 0 0 0 0 0 0[root@localhost ~]#
This is because in mptcp_seq_show(), if mptcp isn't in use, net->mib.mptcp_statistics is NULL,
so it just puts all 0 after "MPTcpExt:", and return, forgot the '\n'.
After this patch:
[root@localhost ~]# cat /proc/net/netstat
...
MPTcpExt: 0 0 0 0 0 0 0 0 0 0 0 0 0
[root@localhost ~]#
Fixes: fc518953bc9c8d7d ("mptcp: add and use MIB counter infrastructure")
Signed-off-by: Jianguo Wu <wujianguo@xxxxxxxxxxxxxxx>
Acked-by: Florian Westphal <fw@xxxxxxxxx>
Link: https://lore.kernel.org/r/142e2fd9-58d9-bb13-fb75-951cccc2331e@xxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/mptcp/mib.c | 1 +
1 file changed, 1 insertion(+)
--- a/net/mptcp/mib.c
+++ b/net/mptcp/mib.c
@@ -58,6 +58,7 @@ void mptcp_seq_show(struct seq_file *seq
for (i = 0; mptcp_snmp_list[i].name; i++)
seq_puts(seq, " 0");
+ seq_putc(seq, '\n');
return;
}
Patches currently in stable-queue which might be from wujianguo@xxxxxxxxxxxxxxx are
queue-5.9/mptcp-print-new-line-in-mptcp_seq_show-if-mptcp-isn-t-in-use.patch
