From: Alexei Starovoitov <ast@kernel.org>
Date: Tue, 14 Jul 2020 19:18:01 +0000 (-0700)
Subject: Merge branch 'usermode-driver-cleanup' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ec2ffdf65f8b2b64f3f40062f0a24861b72cf39f;p=linux.git

Merge branch 'usermode-driver-cleanup' of git://git./linux/kernel/git/ebiederm/user-namespace into bpf-next
---

ec2ffdf65f8b2b64f3f40062f0a24861b72cf39f
diff --cc net/bpfilter/bpfilter_kern.c
index 1905e01c3aa9a,9616fb7defebe..54f82c341e20b
--- a/net/bpfilter/bpfilter_kern.c
+++ b/net/bpfilter/bpfilter_kern.c
@@@ -48,9 -46,9 +46,9 @@@ static int __bpfilter_process_sockopt(s
  	req.cmd = optname;
  	req.addr = (long __force __user)optval;
  	req.len = optlen;
- 	if (!bpfilter_ops.info.pid)
+ 	if (!bpfilter_ops.info.tgid)
  		goto out;
 -	n = __kernel_write(bpfilter_ops.info.pipe_to_umh, &req, sizeof(req),
 +	n = kernel_write(bpfilter_ops.info.pipe_to_umh, &req, sizeof(req),
  			   &pos);
  	if (n != sizeof(req)) {
  		pr_err("write fail %zd\n", n);