From patchwork Mon Jul 13 03:37:11 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: 1327696 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=zx2c4.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=AIvXJJOL; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=zx2c4.com header.i=@zx2c4.com header.a=rsa-sha1 header.s=mail header.b=mFFLES8Y; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B4qBJ669Tz9sR4 for ; Mon, 13 Jul 2020 13:38:45 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=BhuuKFMVkO1aoP0QJiJOkolPNfwBhtkCF8SHFrmvifc=; b=AIvXJJOLe3yH/AQwbCMlKcOZEj njYy2qHj0LiZu9h3rPsRZwjzWc2XZdltkZnIM6uYfK4wpipuoDV1RW+mp5tYbiGrdNNjw8J0WjEx8 frHwpkhX3d15h+HcuDv7eEWUQ3UABOBovR/jgTqdWu9NQq9GC0hEv4gt4Z/mha1H2CPt3W55eFe/f ghovMxiTL1gP51WQ3YxLEVK0WujHjMydN5RHRC63XCMulMMf/AzCUZbx/x4OWGTZZENDjiHpZK5vN QqtgR4dY3ptEcvGAWZ0WgV8G5+ym7Wwu7KdSi6gafLBxI9vjmoE4MntEFkn411n01K1HmZ+ABflml eFsTofdw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jupHK-0004f9-Iz; Mon, 13 Jul 2020 03:37:18 +0000 Received: from mail.zx2c4.com ([192.95.5.64]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jupHI-0004ed-R0 for openwrt-devel@lists.openwrt.org; Mon, 13 Jul 2020 03:37:17 +0000 Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTP id 660dbdce; Mon, 13 Jul 2020 03:15:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=mail; bh=71HUWLK2p5YVVO5icxElP/N7Bas=; b=mFFLES8Yl1CzsOsK9BLS bwK/cVaHwrejzbJqDmzzfdQF/i8OfcYZigYc71hus3f3fmdb7vhgLjcdZk6lEi32 40gEN7PnN8Kej+ryomouNq3Z1Or5pxOBnSG4zfLQs9wqq1rngjJmKIcCyyRB+EIH VYwUy71mOnF7LqPR4eWOfhInduATM6ozLgjnP/c0NpjYlFRhNZfOnFN9keVov6yb Veb6zM1RHLi/hzjD7twStf1YbHe6TNlpNuNnr1A06HWvPv5bGiRMAIArAw7XpV4Q uwagooaeNnKFen+r4ahpyTuezVX+QmyV0WaL00iAUdoDKZXbppOyhjTiN6R/5aVQ Kg== Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 25fb46ab (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 13 Jul 2020 03:15:47 +0000 (UTC) From: "Jason A. Donenfeld" To: openwrt-devel@lists.openwrt.org Subject: [PATCH] wireguard: bump to 1.0.20200712 Date: Sun, 12 Jul 2020 21:37:11 -0600 Message-Id: <20200713033711.1760837-1-Jason@zx2c4.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200712_233716_911119_376ADAF6 X-CRM114-Status: UNSURE ( 8.05 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Jason A. Donenfeld" Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This release brings parity with the commits Linus released a few hours ago into 5.8-rc5. * receive: account for napi_gro_receive never returning GRO_DROP The napi_gro_receive function no longer returns GRO_DROP ever, making handling GRO_DROP dead code. This commit removes that dead code. Further, it's not even clear that device drivers have any business in taking action after passing off received packets; that's arguably out of their hands. * device: implement header_ops->parse_protocol for AF_PACKET WireGuard uses skb->protocol to determine packet type, and bails out if it's not set or set to something it's not expecting. 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 wireguard then rejects the skb. So, this wires up the ip_tunnel handler for layer 3 packets for that case. * queueing: make use of ip_tunnel_parse_protocol Now that wg_examine_packet_protocol has been added for general consumption as ip_tunnel_parse_protocol, it's possible to remove wg_examine_packet_protocol and simply use the new ip_tunnel_parse_protocol function directly. * compat: backport ip_tunnel_parse_protocol and ip_tunnel_header_ops These are required for moving wg_examine_packet_protocol out of wireguard and into upstream. Signed-off-by: Jason A. Donenfeld --- package/network/services/wireguard/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile index b7adf27..19aea4b 100644 --- a/package/network/services/wireguard/Makefile +++ b/package/network/services/wireguard/Makefile @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard -PKG_VERSION:=1.0.20200623 +PKG_VERSION:=1.0.20200712 PKG_RELEASE:=1 PKG_SOURCE:=wireguard-linux-compat-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-linux-compat/snapshot/ -PKG_HASH:=130937724515799edf05ff8216bc837df8acda879428f3a7f96a3287758f9445 +PKG_HASH:=e15b3d4eb2cf186920a6ed13685187d6b846e59eb383c291913628682965ac95 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING