| From 052730ea069bcaa026de6100ed13aefdbaf556c7 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 16 Apr 2021 15:38:02 -0700 |
| Subject: mptcp: fix format specifiers for unsigned int |
| |
| From: Geliang Tang <geliangtang@gmail.com> |
| |
| [ Upstream commit e4b6135134a75f530bd634ea7c168efaf0f9dff3 ] |
| |
| Some of the sequence numbers are printed as the negative ones in the debug |
| log: |
| |
| [ 46.250932] MPTCP: DSS |
| [ 46.250940] MPTCP: data_fin=0 dsn64=0 use_map=0 ack64=1 use_ack=1 |
| [ 46.250948] MPTCP: data_ack=2344892449471675613 |
| [ 46.251012] MPTCP: msk=000000006e157e3f status=10 |
| [ 46.251023] MPTCP: msk=000000006e157e3f snd_data_fin_enable=0 pending=0 snd_nxt=2344892449471700189 write_seq=2344892449471700189 |
| [ 46.251343] MPTCP: msk=00000000ec44a129 ssk=00000000f7abd481 sending dfrag at seq=-1658937016627538668 len=100 already sent=0 |
| [ 46.251360] MPTCP: data_seq=16787807057082012948 subflow_seq=1 data_len=100 dsn64=1 |
| |
| This patch used the format specifier %u instead of %d for the unsigned int |
| values to fix it. |
| |
| Fixes: d9ca1de8c0cd ("mptcp: move page frag allocation in mptcp_sendmsg()") |
| Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net> |
| Signed-off-by: Geliang Tang <geliangtang@gmail.com> |
| Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| net/mptcp/protocol.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c |
| index e337b35a368f..a1fda2ce2f83 100644 |
| --- a/net/mptcp/protocol.c |
| +++ b/net/mptcp/protocol.c |
| @@ -1258,7 +1258,7 @@ static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk, |
| int avail_size; |
| size_t ret = 0; |
| |
| - pr_debug("msk=%p ssk=%p sending dfrag at seq=%lld len=%d already sent=%d", |
| + pr_debug("msk=%p ssk=%p sending dfrag at seq=%llu len=%u already sent=%u", |
| msk, ssk, dfrag->data_seq, dfrag->data_len, info->sent); |
| |
| /* compute send limit */ |
| @@ -1671,7 +1671,7 @@ static int mptcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) |
| if (!msk->first_pending) |
| WRITE_ONCE(msk->first_pending, dfrag); |
| } |
| - pr_debug("msk=%p dfrag at seq=%lld len=%d sent=%d new=%d", msk, |
| + pr_debug("msk=%p dfrag at seq=%llu len=%u sent=%u new=%d", msk, |
| dfrag->data_seq, dfrag->data_len, dfrag->already_sent, |
| !dfrag_collapsed); |
| |
| -- |
| 2.30.2 |
| |