[MPTCP] [PATCH] mptcp: remove msk->subflow->sk dereference in pr_debug statement

[MPTCP] [PATCH] mptcp: remove msk->subflow->sk dereference in pr_debug statement

[Peter Krystad]

[-- Attachment #1: Type: text/plain, Size: 705 bytes --]

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

Signed-off-by: Peter Krystad <peter.krystad(a)linux.intel.com>
---
 net/mptcp/protocol.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index aaa71b161c1a..a58211d8568c 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -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);
 }
-- 
2.17.2

Re: [MPTCP] [PATCH] mptcp: remove msk->subflow->sk dereference in pr_debug statement

[Matthieu Baerts]

[-- Attachment #1: Type: text/plain, Size: 1363 bytes --]

Hi Peter, Mat,

On 27/08/2019 20:09, Mat Martineau wrote:
> 
> On Thu, 22 Aug 2019, Peter Krystad wrote:
> 
>> 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
>>
>> Signed-off-by: Peter Krystad <peter.krystad(a)linux.intel.com>
>> ---
>> net/mptcp/protocol.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
>> index aaa71b161c1a..a58211d8568c 100644
>> --- a/net/mptcp/protocol.c
>> +++ b/net/mptcp/protocol.c
>> @@ -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);
>> }
>> -- 
>> 2.17.2
>>
> 
> Looks 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
-- 
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

Re: [MPTCP] [PATCH] mptcp: remove msk->subflow->sk dereference in pr_debug statement

[Mat Martineau]

[-- Attachment #1: Type: text/plain, Size: 862 bytes --]


On Thu, 22 Aug 2019, Peter Krystad wrote:

> 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
>
> Signed-off-by: Peter Krystad <peter.krystad(a)linux.intel.com>
> ---
> net/mptcp/protocol.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
> index aaa71b161c1a..a58211d8568c 100644
> --- a/net/mptcp/protocol.c
> +++ b/net/mptcp/protocol.c
> @@ -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);
> }
> -- 
> 2.17.2
>

Looks good to merge, thanks for the fix.

--
Mat Martineau
Intel