diff options
| author | David S. Miller <davem@davemloft.net> | 2020-08-02 01:02:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-02 01:02:12 -0700 |
| commit | bd0b33b24897ba9ddad221e8ac5b6f0e38a2e004 (patch) | |
| tree | 3f03062a9e759dba7b09df0feccbb58b8f7ab4cc /net/compat.c | |
| parent | 7126bd5c8bcbc015cf89864cf71d750e8f33f924 (diff) | |
| parent | ac3a0c8472969a03c0496ae774b3a29eb26c8d5a (diff) | |
| download | linux-bd0b33b24897ba9ddad221e8ac5b6f0e38a2e004.tar.gz linux-bd0b33b24897ba9ddad221e8ac5b6f0e38a2e004.tar.bz2 linux-bd0b33b24897ba9ddad221e8ac5b6f0e38a2e004.zip | |
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/compat.c')
| -rw-r--r-- | net/compat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/compat.c b/net/compat.c index 091875bd6210..93ea07e93ae5 100644 --- a/net/compat.c +++ b/net/compat.c @@ -202,7 +202,7 @@ int cmsghdr_from_user_compat_to_kern(struct msghdr *kmsg, struct sock *sk, /* Advance. */ kcmsg = (struct cmsghdr *)((char *)kcmsg + tmp); - ucmsg = cmsg_compat_nxthdr(kmsg, ucmsg, ucmlen); + ucmsg = cmsg_compat_nxthdr(kmsg, ucmsg, cmsg.cmsg_len); } /* |