From patchwork Tue Jun 30 01:06:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 192042 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3369638ilg; Mon, 29 Jun 2020 18:06:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwlQ1K4EEpWaTc1rKM5LRxPrdAT+h7qe7ORDAles+74uj9ailvwwc0u9W/IPB4HUlfLaKsG X-Received: by 2002:a17:906:dbe5:: with SMTP id yd5mr16515199ejb.328.1593479219248; Mon, 29 Jun 2020 18:06:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593479219; cv=none; d=google.com; s=arc-20160816; b=HzLwWskhftZhmsmGN2Vj1A8AbQPQ+C+VW26q0g/N1bSDg1PjhwTHI1ujFMk6BgKs/i LslhqnVUrSy35G12H60DfATVN7Kwu5f4+eiw/C1KdZLvs6B9G1NcZRzMrxCu3+I6uGpl lfrWtajsOFDSoJS1nloX+E3c+PxDbC2spxxSU917vRC8uaWtrs9QERtyxhwNVTklSKfS 3AS8UexkBuyLDkAMmMry1XGBQ0sk/PCrIPAwOlBjJxmiP22HrN6M53LfbXygAcLVHY9T ZZSGD94GSEkCC42Z88mkXoUOAoUolF5aC0SVDUjq8YR2vXxu4JSXF1wIMRiulXZWI9jI hikw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=FBfHJDhXp2F9ZJzGtf+GpIVUbU+Vj14G7RQYJ5uW2TU=; b=HS6Gv5kd1FxdPRECtDfThkOF6gEaCVfi3j4aE7FTYIVB6a1AbktO6hULbz2wTTt+dO TFzqQher8jouQ6KnJOOC8YwEipaJEZVmNB7Y4uwEkJsSmw2tl7gUoPd9zb0dXWJUI2lX nASvXdroJPyQu/17C/yK31kSaEzLhLAxKzaelaJyufbuf7fXtR6nN1RTSipVRWJuQ2r2 rLjaRAgfDs2rVhBD+Pc5n0/53d9005e9YO7SgX6ZFxzpanKMeyOhryq1/psOAfbTO/oq IATBMNyestRkzD97TwpBx2yjXwutI464lKEKQKCTzYkFWn97H6/DNIb7x+/UmJ783mxU tUZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@zx2c4.com header.s=mail header.b=RGb76Hs+; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zx2c4.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d17si849269edu.223.2020.06.29.18.06.59; Mon, 29 Jun 2020 18:06:59 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@zx2c4.com header.s=mail header.b=RGb76Hs+; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zx2c4.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728164AbgF3BG6 (ORCPT + 9 others); Mon, 29 Jun 2020 21:06:58 -0400 Received: from mail.zx2c4.com ([192.95.5.64]:60171 "EHLO mail.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728002AbgF3BGt (ORCPT ); Mon, 29 Jun 2020 21:06:49 -0400 Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTP id 9a11897b; Tue, 30 Jun 2020 00:47:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=mail; bh=A0lWy9h3jqc1a7KNAk9VRzVMi Yo=; b=RGb76Hs+stzcpM6Cm3qD56ZvWNFk3f9dZcsx92Q29Tj5kV+uppfxIv94b w1PwC8r8ar6tePQD97SNREOHcPs/FndQ6VaDvAshGEz/+y58px5TV+Ffka7Mfq6f MC4vgNC3kukh6Z6OrTMuIBj7BAnogbwc2iBXucjZkARU90SQZA/giM1s04cVI1/X 9RtnbkQh23lqBAnwewf3yHncs8yV0F7KcGFiVXQmhBPK/Ho5kU5DJWakOm7rVxPj fh44FEqyQZXH1xynzLj3wDCcDAPW1+3IjNFi9q7EzkolZRt/2JmzhRg0xldyZSY8 r5cy93m7QmyIoLwrLxEjr1614OuMw== Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id e95283e4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 30 Jun 2020 00:47:02 +0000 (UTC) From: "Jason A. Donenfeld" To: netdev@vger.kernel.org, davem@davemloft.net Cc: "Jason A. Donenfeld" , Hans Wippel , Willem de Bruijn Subject: [PATCH net v2 7/8] net: sit: implement header_ops->parse_protocol for AF_PACKET Date: Mon, 29 Jun 2020 19:06:24 -0600 Message-Id: <20200630010625.469202-8-Jason@zx2c4.com> In-Reply-To: <20200630010625.469202-1-Jason@zx2c4.com> References: <20200630010625.469202-1-Jason@zx2c4.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Sit uses skb->protocol to determine packet type, and bails out if it's not set. For AF_PACKET injection, we need to support its call chain of: packet_sendmsg -> packet_snd -> packet_parse_headers -> dev_parse_header_protocol -> parse_protocol Without a valid parse_protocol, this returns zero, and sit rejects the skb. So, this wires up the ip_tunnel handler for layer 3 packets for that case. Reported-by: Willem de Bruijn Signed-off-by: Jason A. Donenfeld --- net/ipv6/sit.c | 1 + 1 file changed, 1 insertion(+) -- 2.27.0 diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 1fbb4dfbb191..5e2c34c0ac97 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -1421,6 +1421,7 @@ static void ipip6_tunnel_setup(struct net_device *dev) int t_hlen = tunnel->hlen + sizeof(struct iphdr); dev->netdev_ops = &ipip6_netdev_ops; + dev->header_ops = &ip_tunnel_header_ops; dev->needs_free_netdev = true; dev->priv_destructor = ipip6_dev_free;