mptcp: remove msk->subflow->sk dereference in pr_debug statement
Subsystems (2)
Peter Krystad
PATCH 1/1 mptcp: remove msk->subflow->sk dereference in pr_debug statement
msk->subflow may be NULL when creation of an mptcp_sock fails due to the protocol not being enabled.
squashto: Add key generation and token tree
--- net/mptcp/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mptcp/protocol.c +1 -1
@@ -702,7 +702,7 @@ static void mptcp_destroy(struct sock *sk) {struct mptcp_sock *msk =mptcp_sk (sk); -pr_debug ("msk=%p, subflow=%p" , sk, msk->subflow->sk); +pr_debug ("msk=%p" , sk);token_destroy (msk->token); }
Signature · 1 line
2.17.2
Mat Martineau
Quoted 26 lines · Peter Krystad
msk->subflowmay be NULL when creation of anmptcp_sockfails due to the protocol not being enabled.squashto: Add key generation and token tree
Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>---
net/mptcp/protocol.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)net/mptcp/protocol.c +1
-1@@ -702,7 +702,7 @@ static void mptcp_destroy(struct sock *sk) {struct mptcp_sock *msk =mptcp_sk (sk); -pr_debug ("msk=%p, subflow=%p" , sk, msk->subflow->sk); +pr_debug ("msk=%p" , sk);token_destroy (msk->token); }Signature · 1 line
2.17.2
Looks good to merge, thanks for the fix.
--
Mat Martineau
Intel
Matthieu Baerts
Hi Peter, Mat,
Quoted 24 lines · Mat Martineau
Quoted 21 lines · Peter Krystad
msk->subflowmay be NULL when creation of anmptcp_sockfails due to the protocol not being enabled.squashto: Add key generation and token tree
Signed-off-by Peter Krystad <peter.krystad(a)linux.intel.com>---
net/mptcp/protocol.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)net/mptcp/protocol.c +1
-1@@ -702,7 +702,7 @@ static void mptcp_destroy(struct sock *sk) { struct mptcp_sock *msk = mptcp_sk(sk); - pr_debug("msk=%p, subflow=%p", sk, msk->subflow->sk); + pr_debug("msk=%p", sk);
Quoted 7 lines
Quoted 5 lines
net/mptcp/protocol.c +0
-0token_destroy(msk->token); }--
2.17.2Looks good to merge, thanks for the fix.
Thank you for the patch and the review!
- 9425f0c9f15c: "squashed" in "mptcp: Add key generation and token tree"
- signed-off already there
- f704ab46b414..b94f6125bd9a: result
Export in progress.
Cheers,
Matt
Signature · 5 lines
Matthieu Baerts | R&D Engineer matthieu.baerts(a)tessares.net Tessares SA | Hybrid Access Solutions www.tessares.net 1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium