Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A43ACC10F0E for ; Fri, 12 Apr 2019 13:30:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 72F062084D for ; Fri, 12 Apr 2019 13:30:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="beVoPk9r" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726905AbfDLNax (ORCPT ); Fri, 12 Apr 2019 09:30:53 -0400 Received: from mail-qk1-f193.google.com ([209.85.222.193]:43330 "EHLO mail-qk1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726755AbfDLNax (ORCPT ); Fri, 12 Apr 2019 09:30:53 -0400 Received: by mail-qk1-f193.google.com with SMTP id c20so5602904qkc.10 for ; Fri, 12 Apr 2019 06:30:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gJuSw3H9qvif6MyNed2MuL8fqTORjmdHPvSbkckXgJQ=; b=beVoPk9rzXMS4PBF0TU+eAig2fspdKUHszAvmLaAVl1cP0Go6v+HCLrZC1/70GiUiu uz/wrhtpk51wVwcF2dMAYRQQbc+2WN91BiiNUpeZrM2Fxq9J8umOLnunqZewYvU+/8wa vKqIQ78HHi5ktn5n82udD1G38v+t8OI6yLoyEhEyYoG+cODecAOo/VtDeePcrrJY0QZj iwfNo+a+CNbEDdLHQ5sDLR6Oo+APuvKb21zgP1ieNF/Jg+Ek82bCWrHlwpaJuOfmGDHX h2l2ClTcc22GvWycOiYEtYjej1vhaMGWlEUf9lYIyLbwDEm0hSUBFNzRL1Qa8P+IrJ8D Hk2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gJuSw3H9qvif6MyNed2MuL8fqTORjmdHPvSbkckXgJQ=; b=DD7E/bIG5s+VWppoSR+RtutiE/vQQW1kJKdv5ShCCovhsca3v769PgMLVzZee4mVdH Zp9+kB6NCF9swQ7faEchj1xW9c0BzYVyVv24u7YJ2YdPfUDUVspfa7ytdQBKn97yQ3EM D9X9K4jt/upCeYOx/rP7q74T7JnFwqKwWy/YsJ2LRHh7LTPurf0Y30t2r08UwbTc5+dg WtpJlbj7JVxP/NdyEVEJjyGhEZECz5xPQLAl+Ry+NK+Y8PwKBOQwBXIXFXP0mpcnNEO9 xGcYQxgXcydtZdpgHV3h6moxi7F8q7PeFnGFA6J9Ev2qvL0haUCo6exm7HrpoXHdf4Eh AJUg== X-Gm-Message-State: APjAAAVCvL6PhZFwi3dxrqxvepRbMcGTmsyPcslIcTVzQwv1AO0dGRt4 CAhi9lXHVWWWJOIqd4wVAvqGfIAA X-Google-Smtp-Source: APXvYqxOaMKMFvgpCfKYofs22/ZJOByDMvxgezdKBU/4v2ADJdebex6NtLYvCDRwPEv+tYERtaXckA== X-Received: by 2002:a37:4bc1:: with SMTP id y184mr44427036qka.169.1555075852085; Fri, 12 Apr 2019 06:30:52 -0700 (PDT) Received: from willemb1.nyc.corp.google.com ([2620:0:1003:315:3fa1:a34c:1128:1d39]) by smtp.gmail.com with ESMTPSA id 204sm23497558qki.58.2019.04.12.06.30.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 06:30:51 -0700 (PDT) From: Willem de Bruijn To: netdev@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, alan.maguire@oracle.com, Willem de Bruijn Subject: [PATCH bpf-next] selftests/bpf: reserve flags in bpf_skb_net_shrink Date: Fri, 12 Apr 2019 09:30:48 -0400 Message-Id: <20190412133048.187570-1-willemdebruijn.kernel@gmail.com> X-Mailer: git-send-email 2.21.0.392.gf8f6787159e-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Willem de Bruijn The ENCAP flags in bpf_skb_adjust_room are ignored on decap with bpf_skb_net_shrink. Reserve these bits for future use. Fixes: 868d523535c2d ("bpf: add bpf_skb_adjust_room encap flags") Signed-off-by: Willem de Bruijn --- net/core/filter.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/core/filter.c b/net/core/filter.c index 95a27fdf9a405..bd1f51907b83b 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -3069,6 +3069,9 @@ static int bpf_skb_net_shrink(struct sk_buff *skb, u32 off, u32 len_diff, { int ret; + if (flags & ~BPF_F_ADJ_ROOM_FIXED_GSO) + return -EINVAL; + if (skb_is_gso(skb) && !skb_is_gso_tcp(skb)) { /* udp gso_size delineates datagrams, only allow if fixed */ if (!(skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4) || -- 2.21.0.392.gf8f6787159e-goog