Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp2301011pxp; Mon, 21 Mar 2022 16:18:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzakXDFWiW6q+RtM6hxnOOUJSBWtU8Ny7FHcz0r0VWZBm5UwMMT7CE6bj0BYX/tiMhOYnQZ X-Received: by 2002:a63:eb51:0:b0:382:53c4:bb66 with SMTP id b17-20020a63eb51000000b0038253c4bb66mr9519345pgk.540.1647904707206; Mon, 21 Mar 2022 16:18:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647904707; cv=none; d=google.com; s=arc-20160816; b=w0mvF83bQacn7BmZaCvvxocopIrope+Ziy7+JkRzNkLgjFxYCKH1s55zC6TffthOjd HZjHc1OhLO70EbOafwiXbJrozjmTvhTbiizqecr0tAVrEL+QTA0j/aliDht7VGNZFRnh FqzU9HysqTNHyjOkvCK3dUzlGv72kkGF0K3881FOpCvfjBCrnd+0HBvqMPbmkW37b9gR 4fhQQq5+vdIeiZAQtl5zST3li9k14OCjDMdbURN7KuXLOscn91AaVuf3vfT4q5hhr44z np4HQogqUtOBzq2LVCFYTpUtMk3WijR0KvpoykyLF9Wyc1QIBBt3BbydTxkjHdEi87rZ 1+6w== 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=lpima+TmSNBgnkbOTvcg4GNSP1Ty7EaikOKLQExkay4=; b=RdSLd2Oq+n400cTEBdF3C6q3hjTwJKZHHp24dhnjcTlHbBV2S3g5WqoVgM7jJhD1BL xWzgT44r2HBHTvYuL3OJDdO8UvPv4Kv6Hj8TMlYpa56HfQhkz372KVQQDkxL9+ENQkzZ hRj2vRcIuzmLIkVwfjjGZu7xnyKzO0KfnohW74T2Wp4y8JlrzbTLT0sghj5vI29rT7os SrvWsFegH5GSAhczyBkeRVYhjX3vLJw2Zkk8yOCJNmN3OLVEy//EWoqBztbeV/qrnXS2 0ijcakgyv7qwjjISetpzUi6CptM2UfJOZBWKOdivcW8BoYNXjOlhfqSYEW9m2ZKl58P1 z/Gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CDT7XZs3; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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. [23.128.96.19]) by mx.google.com with ESMTPS id b18-20020a17090a489200b001bfbcffdbeasi652470pjh.3.2022.03.21.16.18.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Mar 2022 16:18:27 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=CDT7XZs3; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 43454455D00; Mon, 21 Mar 2022 15:16:32 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351493AbiCUOLG (ORCPT + 99 others); Mon, 21 Mar 2022 10:11:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349128AbiCUODV (ORCPT ); Mon, 21 Mar 2022 10:03:21 -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 4688D41625; Mon, 21 Mar 2022 07:00:25 -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 E9561B816D8; Mon, 21 Mar 2022 14:00:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B652C340E8; Mon, 21 Mar 2022 14:00:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1647871220; bh=P2IQTYz+6Lh8+CGifj/lOi7qPetT3jjEs9BZ0XForo0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CDT7XZs3BzuOjqE5lt7rt2sdL4r9dhEwGEj53j/qWb7R6apOF7CWg18qjkgipYymw SFdJem8uwzlK/Nd205sCRZaWuDJWVY/XY05SHBfMzKrUGOUAzqJKVicX3dTBpPq5HA xdicI7n4c7LWacvyJ2juBE2V+yLxWHvmxo5DJahY= 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.15 17/32] net: handle ARPHRD_PIMREG in dev_is_mac_header_xmit() Date: Mon, 21 Mar 2022 14:52:53 +0100 Message-Id: <20220321133221.062245657@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220321133220.559554263@linuxfoundation.org> References: <20220321133220.559554263@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 b712217f7030..1ed52441972f 100644 --- a/include/linux/if_arp.h +++ b/include/linux/if_arp.h @@ -52,6 +52,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