[PATCH net-next] Squash-to: "mptcp: fix possible divide by zero"

[PATCH net-next] Squash-to: "mptcp: fix possible divide by zero"

[Paolo Abeni]

To be appended to the commit message:

v1 -> v2:
 - use lockdep_assert_held_once() - Jakub
 - fix indentation - Jakub

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
 net/mptcp/protocol.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 898485e4c1dd..eda149d89f4e 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1008,9 +1008,7 @@ static void mptcp_wmem_uncharge(struct sock *sk, int size)
 
 static void __mptcp_mem_reclaim_partial(struct sock *sk)
 {
-#ifdef CONFIG_LOCKDEP
-	WARN_ON_ONCE(!lockdep_is_held(&sk->sk_lock.slock));
-#endif
+	lockdep_assert_held_once(&sk->sk_lock.slock);
 	__mptcp_update_wmem(sk);
 	sk_mem_reclaim_partial(sk);
 }
@@ -1515,7 +1513,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned int flags)
 	struct sock *prev_ssk = NULL, *ssk = NULL;
 	struct mptcp_sock *msk = mptcp_sk(sk);
 	struct mptcp_sendmsg_info info = {
-				.flags = flags,
+		.flags = flags,
 	};
 	struct mptcp_data_frag *dfrag;
 	int len, copied = 0;
-- 
2.26.3

Re: [PATCH net-next] Squash-to: "mptcp: fix possible divide by zero"

[Matthieu Baerts]

Hi Paolo,

On 31/08/2021 09:40, Paolo Abeni wrote:
> To be appended to the commit message:
> 
> v1 -> v2:
>  - use lockdep_assert_held_once() - Jakub
>  - fix indentation - Jakub

Thank you for the patch!

- b09c5f12162d: "squashed" in "mptcp: fix possible divide by zero"
- f6abbc960435: tg:msg: update commit message after squash-to patch
- Results: f651c564fd29..54851c6a542b

Builds and tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20210831T081314
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export/20210831T081314

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net