Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bpf: Fix tcp_bufs_kern.c sample program

Browse source 
The program was returning -1 in some cases which is not allowed
by the verifier any longer.

Fixes: 390ee7e29f ("bpf: enforce return code for cgroup-bpf programs")
Signed-off-by: Lawrence Brakmo <brakmo@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Lawrence Brakmo 2017-11-10 22:19:52 -08:00 committed by David S. Miller
parent 016e661bb0
commit a4174f0560
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
samples/bpf/tcp_bufs_kern.c
View file

@ -41,8 +41,10 @@ int bpf_bufs(struct bpf_sock_ops *skops)
* if neither port numberis 55601 * if neither port numberis 55601
*/ */
if (bpf_ntohl(skops->remote_port) != 55601 && if (bpf_ntohl(skops->remote_port) != 55601 &&
skops->local_port != 55601) skops->local_port != 55601) {
return -1; skops->reply = -1;
return 1;
}
op = (int) skops->op; op = (int) skops->op;
@ -61,8 +63,8 @@ int bpf_bufs(struct bpf_sock_ops *skops)
/* Set sndbuf and rcvbuf of active connections */ /* Set sndbuf and rcvbuf of active connections */
rv = bpf_setsockopt(skops, SOL_SOCKET, SO_SNDBUF, &bufsize, rv = bpf_setsockopt(skops, SOL_SOCKET, SO_SNDBUF, &bufsize,
sizeof(bufsize)); sizeof(bufsize));
rv = rv*100 + bpf_setsockopt(skops, SOL_SOCKET, SO_RCVBUF, rv += bpf_setsockopt(skops, SOL_SOCKET, SO_RCVBUF,
&bufsize, sizeof(bufsize)); &bufsize, sizeof(bufsize));
break; break;
case BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB: case BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB:
/* Nothing to do */ /* Nothing to do */
@ -71,8 +73,8 @@ int bpf_bufs(struct bpf_sock_ops *skops)
/* Set sndbuf and rcvbuf of passive connections */ /* Set sndbuf and rcvbuf of passive connections */
rv = bpf_setsockopt(skops, SOL_SOCKET, SO_SNDBUF, &bufsize, rv = bpf_setsockopt(skops, SOL_SOCKET, SO_SNDBUF, &bufsize,
sizeof(bufsize)); sizeof(bufsize));
rv = rv*100 + bpf_setsockopt(skops, SOL_SOCKET, SO_RCVBUF, rv += bpf_setsockopt(skops, SOL_SOCKET, SO_RCVBUF,
&bufsize, sizeof(bufsize)); &bufsize, sizeof(bufsize));
break; break;
default: default:
rv = -1; rv = -1;