From: Lawrence Brakmo Subject: [PATCH net-next v2 4/6] bpf: Fix tcp_cong_kern.c sample program Date: Fri, 10 Nov 2017 22:19:53 -0800 Message-ID: <20171111061955.615775-5-brakmo@fb.com> References: <20171111061955.615775-1-brakmo@fb.com> Mime-Version: 1.0 Content-Type: text/plain Cc: Alexei Starovoitov , Daniel Borkmann To: netdev Return-path: Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:46162 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751280AbdKKGUA (ORCPT ); Sat, 11 Nov 2017 01:20:00 -0500 Received: from pps.filterd (m0001303.ppops.net [127.0.0.1]) by m0001303.ppops.net (8.16.0.21/8.16.0.21) with SMTP id vAB6GVj6032296 for ; Fri, 10 Nov 2017 22:19:59 -0800 Received: from mail.thefacebook.com ([199.201.64.23]) by m0001303.ppops.net with ESMTP id 2e5u0vg47t-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Fri, 10 Nov 2017 22:19:59 -0800 In-Reply-To: <20171111061955.615775-1-brakmo@fb.com> Sender: netdev-owner@vger.kernel.org List-ID: 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 --- samples/bpf/tcp_cong_kern.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/samples/bpf/tcp_cong_kern.c b/samples/bpf/tcp_cong_kern.c index dac15bc..ad0f1ba 100644 --- a/samples/bpf/tcp_cong_kern.c +++ b/samples/bpf/tcp_cong_kern.c @@ -39,8 +39,10 @@ int bpf_cong(struct bpf_sock_ops *skops) * if neither port numberis 55601 */ if (bpf_ntohl(skops->remote_port) != 55601 && - skops->local_port != 55601) - return -1; + skops->local_port != 55601) { + skops->reply = -1; + return 1; + } op = (int) skops->op; -- 2.9.5