From patchwork Sat Nov 11 06:19:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lawrence Brakmo X-Patchwork-Id: 836991 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=fb.com header.i=@fb.com header.b="rabkT1j1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yYmwR0KXzz9sRW for ; Sat, 11 Nov 2017 17:20:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751812AbdKKGUE (ORCPT ); Sat, 11 Nov 2017 01:20:04 -0500 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=facebook; bh=A92YrTXUvHUrZywHNjupsJ2na1M6AqMMnL+v+sTO9zU=; b=rabkT1j1oooNrs0RwmXjAGBKFWLhgrcs+y8gORLr8dJE1VhLZF6/ul7rFg/5vh9b0Gw2 UqCf95sGj6Qe73ExVW5VR4t4cv7OHX58UcTeLgRVaFTX1ZHzgv8ZcEI7BhfWX94fYMnt 73WfO2iEzJrJSKQ35RMe7Jl1Oz/IYyNjy2o= 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 Received: from mx-out.facebook.com (192.168.52.123) by PRN-CHUB03.TheFacebook.com (192.168.16.13) with Microsoft SMTP Server id 14.3.361.1; Fri, 10 Nov 2017 22:19:57 -0800 Received: by dev15893.prn1.facebook.com (Postfix, from userid 10340) id 591EAC24630; Fri, 10 Nov 2017 22:19:58 -0800 (PST) Smtp-Origin-Hostprefix: dev From: Lawrence Brakmo Smtp-Origin-Hostname: dev15893.prn1.facebook.com To: netdev CC: Alexei Starovoitov , Daniel Borkmann Smtp-Origin-Cluster: prn1c29 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> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171111061955.615775-1-brakmo@fb.com> References: <20171111061955.615775-1-brakmo@fb.com> X-FB-Internal: Safe MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-11-11_02:, , signatures=0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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;