netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lawrence Brakmo <brakmo@fb.com>
To: netdev <netdev@vger.kernel.org>
Cc: Alexei Starovoitov <ast@fb.com>, Daniel Borkmann <daniel@iogearbox.net>
Subject: [PATCH net-next v2 2/6] bpf: Fix tcp_rwnd_kern.c sample program
Date: Fri, 10 Nov 2017 22:19:51 -0800	[thread overview]
Message-ID: <20171111061955.615775-3-brakmo@fb.com> (raw)
In-Reply-To: <20171111061955.615775-1-brakmo@fb.com>

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

Fixes: 390ee7e29fc8 ("bpf: enforce return code for cgroup-bpf programs")
Signed-off-by: Lawrence Brakmo <brakmo@fb.com>
---
 samples/bpf/tcp_rwnd_kern.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/samples/bpf/tcp_rwnd_kern.c b/samples/bpf/tcp_rwnd_kern.c
index 3f2a228..09ff65b 100644
--- a/samples/bpf/tcp_rwnd_kern.c
+++ b/samples/bpf/tcp_rwnd_kern.c
@@ -38,8 +38,10 @@ int bpf_rwnd(struct bpf_sock_ops *skops)
 	 * if neither port numberis 55601
 	 */
 	if (bpf_ntohl(skops->remote_port) !=
-	    55601 && skops->local_port != 55601)
-		return -1;
+	    55601 && skops->local_port != 55601) {
+		skops->reply = -1;
+		return 1;
+	}
 
 	op = (int) skops->op;
 
-- 
2.9.5

  parent reply	other threads:[~2017-11-11  6:20 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-11  6:19 [PATCH net-next v2 0/6] bpf: Fix bugs in sock_ops samples Lawrence Brakmo
2017-11-11  6:19 ` [PATCH net-next v2 1/6] bpf: Fix tcp_synrto_kern.c sample program Lawrence Brakmo
2017-11-11  6:19 ` Lawrence Brakmo [this message]
2017-11-11  6:19 ` [PATCH net-next v2 3/6] bpf: Fix tcp_bufs_kern.c " Lawrence Brakmo
2017-11-11  6:19 ` [PATCH net-next v2 4/6] bpf: Fix tcp_cong_kern.c " Lawrence Brakmo
2017-11-11  6:19 ` [PATCH net-next v2 5/6] bpf: Fix tcp_iw_kern.c " Lawrence Brakmo
2017-11-11  6:19 ` [PATCH net-next v2 6/6] bpf: Fix tcp_clamp_kern.c " Lawrence Brakmo
2017-11-11  6:52 ` [PATCH net-next v2 0/6] bpf: Fix bugs in sock_ops samples David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171111061955.615775-3-brakmo@fb.com \
    --to=brakmo@fb.com \
    --cc=ast@fb.com \
    --cc=daniel@iogearbox.net \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).