]> asedeno.scripts.mit.edu Git - linux.git/commit
net: sock_map, fix missing ulp check in sock hash case
authorJohn Fastabend <john.fastabend@gmail.com>
Tue, 3 Sep 2019 20:24:50 +0000 (13:24 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Sep 2019 09:56:19 +0000 (11:56 +0200)
commit44580a0118d3ede95fec4dce32df5f75f73cd663
treee20b7033f69b160b603eaf9a9809ee5742066f8c
parentebe26aca98fcf9fbe5017b5cbe216413cee69df5
net: sock_map, fix missing ulp check in sock hash case

sock_map and ULP only work together when ULP is loaded after the sock
map is loaded. In the sock_map case we added a check for this to fail
the load if ULP is already set. However, we missed the check on the
sock_hash side.

Add a ULP check to the sock_hash update path.

Fixes: 604326b41a6fb ("bpf, sockmap: convert to generic sk_msg interface")
Reported-by: syzbot+7a6ee4d0078eac6bf782@syzkaller.appspotmail.com
Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/sock_map.c