diff options
| author | David S. Miller <davem@davemloft.net> | 2020-08-02 11:02:12 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-02 11:02:12 +0300 |
| commit | bd0b33b24897ba9ddad221e8ac5b6f0e38a2e004 (patch) | |
| tree | 3f03062a9e759dba7b09df0feccbb58b8f7ab4cc /net/rxrpc/recvmsg.c | |
| parent | 7126bd5c8bcbc015cf89864cf71d750e8f33f924 (diff) | |
| parent | ac3a0c8472969a03c0496ae774b3a29eb26c8d5a (diff) | |
| download | linux-bd0b33b24897ba9ddad221e8ac5b6f0e38a2e004.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Resolved kernel/bpf/btf.c using instructions from merge commit
69138b34a7248d2396ab85c8652e20c0c39beaba
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rxrpc/recvmsg.c')
| -rw-r--r-- | net/rxrpc/recvmsg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/recvmsg.c b/net/rxrpc/recvmsg.c index 490b1927215c..efecc5a8f67d 100644 --- a/net/rxrpc/recvmsg.c +++ b/net/rxrpc/recvmsg.c @@ -620,7 +620,7 @@ try_again: goto error_unlock_call; } - if (msg->msg_name) { + if (msg->msg_name && call->peer) { struct sockaddr_rxrpc *srx = msg->msg_name; size_t len = sizeof(call->peer->srx); |