Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp2307927pxp; Mon, 21 Mar 2022 16:30:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwX/3afAncf9CpBaF48fNjRITAFg7aVSyxuVizuHwDi7smJWPcFz9zDiWzkMplHZmyz7W4O X-Received: by 2002:a17:903:2345:b0:154:de5:a26b with SMTP id c5-20020a170903234500b001540de5a26bmr15700898plh.114.1647905452339; Mon, 21 Mar 2022 16:30:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647905452; cv=none; d=google.com; s=arc-20160816; b=CQVRFNbNgYDht8SiQvZROdvoLOxeKM2o6BTaht0CKEmxmhYVFNkShAMBAtP1FirAKa yuHCX2KsWHUQj2AQIa2/ifD5lVbwtADgkO/QW3gYHmHj3shiYTjWArkcW5i+ajiGsG27 JjtwE0JtCw9LvFbXC5NKhBjsXGi7pb7Ivfkj2pFsW7Ox6awA7YNPIR9MYrwqqe6xr78J 0+vD0Z1TZjQiPgGOZzuybkRhDy8SUuIjGFSpBVI3ivHwo6c12avyUTHZYloi07beIu9H q2QSJGxsHIEmBeRjviXJgc0aeCGQL52R4NxRn7rfVSvcxVEDra82rRg6QGIrsl7ufjtV aBJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=86FlwnX5TGUGeVZigc5EXDSs6vqtZ+5BsCvfuNg9ELo=; b=Cut4aeSgrjJNVnenUCUhRuw+p3KbpEgim/4QOJrVXXUqUM0T0SipxqSBaERjNFYhCP C/r7DtiYIIE+aN4GgqeN7ntGArbBpBysaRKlWzzlONTbBPAN11i8X0moQHf8oU/hq7kw fTpISWnwEXDh8fDtf4vsf+srn9wdmInBGCt0onUlGPp5jltR98R5le2u/TREohso5oZW mYZQwcyWeJ4B87cmu5l2xmvJv8mb47zxL4mmAqtcZZfUXs1v3TC7waQNueBVMICI3vjc 7QxylQaTJTCuzQCyZsnC/kD74PlggZqIkI14c7FLZlnAE0oJ4bqFFCFReJ1xjXZ7Zpyi TtSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=dC97XBpa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id h3-20020a17090aea8300b001bd14e01f63si714772pjz.81.2022.03.21.16.30.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Mar 2022 16:30:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=dC97XBpa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 410B546F470; Mon, 21 Mar 2022 15:21:36 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348886AbiCUOGW (ORCPT + 99 others); Mon, 21 Mar 2022 10:06:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349232AbiCUN7y (ORCPT ); Mon, 21 Mar 2022 09:59:54 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D80B2529B; Mon, 21 Mar 2022 06:58:28 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 4624BB81598; Mon, 21 Mar 2022 13:58:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F890C340E8; Mon, 21 Mar 2022 13:58:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1647871105; bh=z5b40hV7USiaybTi52DgQM4KYPVIVs5XmZFdjoSRWQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dC97XBpaEqAGch/Hpnu9ReTUkIcZati51cN0/4DrxeIPFFym8jMbb/Gnlq2/lGf3E qb67I7IvuZ/MQlEbufsNik0aTs3RIyeKoJUlNe/vFKdflKn7xykWFxMntrCxwNgcQd sC35GLxbUQti8tE2b/fFl/lxIYYPQCcrs3fPGHTI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicolas Dichtel , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.4 09/17] net: handle ARPHRD_PIMREG in dev_is_mac_header_xmit() Date: Mon, 21 Mar 2022 14:52:45 +0100 Message-Id: <20220321133217.426561871@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220321133217.148831184@linuxfoundation.org> References: <20220321133217.148831184@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nicolas Dichtel [ Upstream commit 4ee06de7729d795773145692e246a06448b1eb7a ] This kind of interface doesn't have a mac header. This patch fixes bpf_redirect() to a PIM interface. Fixes: 27b29f63058d ("bpf: add bpf_redirect() helper") Signed-off-by: Nicolas Dichtel Link: https://lore.kernel.org/r/20220315092008.31423-1-nicolas.dichtel@6wind.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- include/linux/if_arp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h index bf5c5f32c65e..e147ea679467 100644 --- a/include/linux/if_arp.h +++ b/include/linux/if_arp.h @@ -51,6 +51,7 @@ static inline bool dev_is_mac_header_xmit(const struct net_device *dev) case ARPHRD_VOID: case ARPHRD_NONE: case ARPHRD_RAWIP: + case ARPHRD_PIMREG: return false; default: return true; -- 2.34.1