net/af_iucv: set correct sk_protocol for child sockets
Subsystems (4)
PATCH 1/1 net/af_iucv: set correct sk_protocol for child sockets
Child sockets erroneously inherit their parent's sk_type (ie. SOCK_*), instead of the PF_IUCV protocol that the parent was created with in iucv_sock_create().
We're currently not using sk->sk_protocol ourselves, so this shouldn't have much impact (except eg. getting the output in skb_dump() right).
--- net/iucv/af_iucv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/iucv/af_iucv.c +2 -2
@@ -1645,7 +1645,7 @@ static int iucv_callback_connreq(struct iucv_path *path, }/* Create the new socket */ - nsk =iucv_sock_alloc (NULL , sk->sk_type,GFP_ATOMIC ,0 ); + nsk =iucv_sock_alloc (NULL , sk->sk_protocol,GFP_ATOMIC ,0 );if (!nsk) { err = pr_iucv->path_sever (path, user_data);iucv_path_free (path);
@@ -1851,7 +1851,7 @@ static int afiucv_hs_callback_syn(struct sock *sk, struct sk_buff *skb) goto out; } - nsk =iucv_sock_alloc (NULL , sk->sk_type,GFP_ATOMIC ,0 ); + nsk =iucv_sock_alloc (NULL , sk->sk_protocol,GFP_ATOMIC ,0 );bh_lock_sock (sk); if ((sk->sk_state != IUCV_LISTEN) || sk_acceptq_is_full(sk) ||
Signature · 1 line
2.17.1
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 8 lines · On Fri, 20 Nov 2020 11:06:57 +0100 you wrote:
Child sockets erroneously inherit their parent's
sk_type(ie. SOCK_*), instead of thePF_IUCVprotocol that the parent was created with iniucv_sock_create().We're currently not using
sk->sk_protocolourselves, so this shouldn't have much impact (except eg. getting the output inskb_dump()right).[...]
Here is the summary with links:
- [net] net/af_iucv: set correct sk_protocol for child sockets
https://git.kernel.org/netdev/net/c/c5dab0941fcd
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html