GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-04 21:31:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'bpf-Fix-bugs-in-sock_ops-samples'

Browse source 
Lawrence Brakmo says:

====================
bpf: Fix bugs in sock_ops samples

The programs were returning -1 in some cases when they should
only return 0 or 1. Changes in the verifier now catch this
issue and the programs fail to load. This is now fixed.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2017-11-11 15:52:41 +09:00
commit bee955cd3a
6 changed files with 41 additions and 29 deletions
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;

24
samples/bpf/tcp_clamp_kern.c
View file

@ -41,8 +41,10 @@ int bpf_clamp(struct bpf_sock_ops *skops)
/* For testing purposes, only execute rest of BPF program /* For testing purposes, only execute rest of BPF program
* if neither port numberis 55601 * if neither port numberis 55601
*/ */
if (bpf_ntohl(skops->remote_port) != 55601 && skops->local_port != 55601) if (bpf_ntohl(skops->remote_port) != 55601 && skops->local_port != 55601) {
return -1; skops->reply = -1;
return 0;
}
op = (int) skops->op; op = (int) skops->op;
@ -66,9 +68,9 @@ int bpf_clamp(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, rv = bpf_setsockopt(skops, SOL_SOCKET, SO_SNDBUF,
&bufsize, sizeof(bufsize)); &bufsize, sizeof(bufsize));
rv = rv*100 + bpf_setsockopt(skops, SOL_SOCKET, rv += bpf_setsockopt(skops, SOL_SOCKET,
SO_RCVBUF, &bufsize, SO_RCVBUF, &bufsize,
sizeof(bufsize)); sizeof(bufsize));
break; break;
case BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB: case BPF_SOCK_OPS_ACTIVE_ESTABLISHED_CB:
rv = bpf_setsockopt(skops, SOL_TCP, rv = bpf_setsockopt(skops, SOL_TCP,
@ -80,12 +82,12 @@ int bpf_clamp(struct bpf_sock_ops *skops)
rv = bpf_setsockopt(skops, SOL_TCP, rv = bpf_setsockopt(skops, SOL_TCP,
TCP_BPF_SNDCWND_CLAMP, TCP_BPF_SNDCWND_CLAMP,
&clamp, sizeof(clamp)); &clamp, sizeof(clamp));
rv = rv*100 + bpf_setsockopt(skops, SOL_SOCKET, rv += bpf_setsockopt(skops, SOL_SOCKET,
SO_SNDBUF, &bufsize, SO_SNDBUF, &bufsize,
sizeof(bufsize)); sizeof(bufsize));
rv = rv*100 + bpf_setsockopt(skops, SOL_SOCKET, rv += bpf_setsockopt(skops, SOL_SOCKET,
SO_RCVBUF, &bufsize, SO_RCVBUF, &bufsize,
sizeof(bufsize)); sizeof(bufsize));
break; break;
default: default:
rv = -1; rv = -1;

6
samples/bpf/tcp_cong_kern.c
View file

@ -39,8 +39,10 @@ int bpf_cong(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;

14
samples/bpf/tcp_iw_kern.c
View file

@ -42,8 +42,10 @@ int bpf_iw(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;
@ -62,8 +64,8 @@ int bpf_iw(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:
rv = bpf_setsockopt(skops, SOL_TCP, TCP_BPF_IW, &iw, rv = bpf_setsockopt(skops, SOL_TCP, TCP_BPF_IW, &iw,
@ -73,8 +75,8 @@ int bpf_iw(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;

6
samples/bpf/tcp_rwnd_kern.c
View file

@ -38,8 +38,10 @@ int bpf_rwnd(struct bpf_sock_ops *skops)
* if neither port numberis 55601 * if neither port numberis 55601
*/ */
if (bpf_ntohl(skops->remote_port) != if (bpf_ntohl(skops->remote_port) !=
55601 && skops->local_port != 55601) 55601 && skops->local_port != 55601) {
return -1; skops->reply = -1;
return 1;
}
op = (int) skops->op; op = (int) skops->op;

6
samples/bpf/tcp_synrto_kern.c
View file

@ -38,8 +38,10 @@ int bpf_synrto(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;