From patchwork Mon Jul 6 11:34:00 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Lici X-Patchwork-Id: 5095 Return-Path: Delivered-To: patchwork@openvpn.net Received: by 2002:a05:7000:1887:b0:869:83bc:8c48 with SMTP id r7csp5321280max; Mon, 6 Jul 2026 04:34:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AFNElJ+DNmm6LbmFO/avYnjKKHzlqZE5VfBPAZGcWNxISN594d2okChaKczZVxNOV3rjTsQA//MLpc6WcO0=@openvpn.net X-Received: by 2002:a05:6808:1809:b0:491:177:c22d with SMTP id 5614622812f47-49fde4edae8mr38009b6e.36.1783337681850; Mon, 06 Jul 2026 04:34:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1783337681; cv=none; d=google.com; s=arc-20260327; b=mCT1vfiVSdMJsCXi0Qrck05IlEDqvT17hSh5G1YoutEJW/xCENqSp0VL8bgNF3SAk4 o2FTtdaESzvApeq4KpfzqMyA5vGQO6FFu0mhsZIyEvb6N0RY7YTb7JIz1cdXqlwYaUy+ BARUQdjFfu6RGFyYVhG0irwUKDEfMTegUgW8P5cht83l+8KnaRJ9G2JCbAYoWU2eZUdQ bsdFEr57o+UjQfP7L1PzTMy8PhaqldhQB+Mu26g6rj+M+JkBlDMudErOY/ugOq/8sQc7 fwBsFnPxDxrcIEsTfll8c0PZwpTxR1SqyIXnnP5QZ3X+IDioUhHcisO91fIaUK/BW+BC nc6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:dkim-signature:dkim-signature:dkim-signature; bh=snf86ACK7pR/66YC38aPi3X1DEvpWi3gjafw99J7Jq4=; fh=4NbAC/LsuMLI0S0hprUlLSLCiHwg6SCAifhH718Jh0Q=; b=fAkE1oWtV18oJCKR6Tt+mNWOJSZBUkOT+ftjiym1W7iLoK+QUcUmEgVuQBxQucD6R/ SfG9Uuth8c2jikVyhegI3wUVeiVgqpiUwwhAKv3SvvOeMcEl7RGDWjavJipatV4X/Xnf FU5mk7HM0q+/1slm/JwH+62+wO1cGgC97wYefh3J+O7qLoq+X7addgT4UpgcE1emcPnI s6ABSenJRhaPeafTD0hgu8x6ZHjMAR9gLKCDyOnlYxWXhcptLDDIZ9T1UeI+UNFNYoyx Erf9H08HOW/FF/WdBX5Wfy5DGwlg38qO/lG6xHW8sJRDIADSkmgmW3RffERE7N/UPO+K Fipw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=aiDRlPan; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="hljvTr/a"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=fOofZ4zc; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b=Y5PqyC+n; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net Received: from lists.sourceforge.net (lists.sourceforge.net. [216.105.38.7]) by mx.google.com with ESMTPS id 5614622812f47-497d1bff3c2si9219632b6e.72.2026.07.06.04.34.41 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jul 2026 04:34:41 -0700 (PDT) Received-SPF: pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) client-ip=216.105.38.7; Authentication-Results: mx.google.com; dkim=pass header.i=@lists.sourceforge.net header.s=beta header.b=aiDRlPan; dkim=neutral (body hash did not verify) header.i=@sourceforge.net header.s=x header.b="hljvTr/a"; dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x header.b=fOofZ4zc; dkim=neutral (body hash did not verify) header.i=@mandelbit.com header.s=MBO0001 header.b=Y5PqyC+n; spf=pass (google.com: domain of openvpn-devel-bounces@lists.sourceforge.net designates 216.105.38.7 as permitted sender) smtp.mailfrom=openvpn-devel-bounces@lists.sourceforge.net DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.sourceforge.net; s=beta; h=Content-Transfer-Encoding:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Subject:MIME-Version:References:In-Reply-To:Message-ID:Date:To:From:Sender: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=snf86ACK7pR/66YC38aPi3X1DEvpWi3gjafw99J7Jq4=; b=aiDRlPanEB2sIxpKVLgTEp8OrU IJRfgDwEDu3Wr71MLsuV5cURoIQaHMis9ORaTedWJc0iqoIctcsgs2YLTr7h8zx0lu2N2gB3sd4N5 x0O4z9rgj2QWt6acFEkzjY6Dt5EdQUJBF9Ue6OMc1R+5bofWOgJcoi2+2w410c5umYDw=; Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1wghaz-0000Qf-4z; Mon, 06 Jul 2026 11:34:38 +0000 Received: from [172.30.29.66] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1wghax-0000QR-4u for openvpn-devel@lists.sourceforge.net; Mon, 06 Jul 2026 11:34:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=3ZkA9c6PszFdxD78qgW/7qFDfcs1CN1vNs0EKzltPtk=; b=hljvTr/a+qjpb5L+EGNjVHyQwK XEzfc3bO7Gm09o4QpJmXRDxFdpKtmD69/e0Xl7c23wpxF73FrPlg7yIfcf4A1YRIXFYqpU8ORnx3Q YXRdjE2A8ByWB5BodixJMxc03gxJoN4xELeKVsWN3E6E6ImIBF57wgjY55xKrtvd/6NE=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=3ZkA9c6PszFdxD78qgW/7qFDfcs1CN1vNs0EKzltPtk=; b=fOofZ4zcwueEJEvG186rvwPi16 PuIp7McOmFV1PJru1TIw7zKWIkKzyxK9vpOQZl3wVR5qI8bZ2wVkSJhTud79ka93cotV6jNfW3bgV RIpJ+pHx7seGEfCHWJxP7b3KpW/kFVGRvcJix53NX9h7KA2QPMqJrrQgl7gY5UA/lhFM=; Received: from mout-b-112.mailbox.org ([195.10.208.42]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1wghar-0006lt-F1 for openvpn-devel@lists.sourceforge.net; Mon, 06 Jul 2026 11:34:36 +0000 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::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 mout-b-112.mailbox.org (Postfix) with ESMTPS id 4gv2M03kSlzDvmW; Mon, 6 Jul 2026 13:34:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandelbit.com; s=MBO0001; t=1783337660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3ZkA9c6PszFdxD78qgW/7qFDfcs1CN1vNs0EKzltPtk=; b=Y5PqyC+nhRhHUklfTbgKiGAHmWTG5gwjqaN/0UD3hSSzRQDxLQjdnH7e5N2pBZ0LkFIkZR r9kHxkM2Mzm1QyssqOOHLAdpZzGn1lJDjfAsDLUwbvSWCEXABptmnHVQNFbI4En18fxGDq A1KI+e2OM/+BlvHt4sAuYeJrI0USid7ASPwVSWFw4hB7SbugNgvxPb258nSYu/xFHKYIni 32tx5nxpp/XG6b4t7rmSV9MvqJaLDoU5peBoMaru+2LGv+kSe7AWAhkcuBaALPAKCy7eXp iC5yp6l1Er+SgZFWMM9FF0ZawgLNBEDPnmihINI336nNJ6y171bPb6Vd+bXC0g== Authentication-Results: outgoing_mbo_mout; dkim=none; spf=pass (outgoing_mbo_mout: domain of ralf@mandelbit.com designates 2001:67c:2050:b231:465::1 as permitted sender) smtp.mailfrom=ralf@mandelbit.com From: Ralf Lici To: openvpn-devel@lists.sourceforge.net Date: Mon, 6 Jul 2026 13:34:00 +0200 Message-ID: <6e44855f0fcd704da43dd83b42a1236cb804c76e.1783336121.git.ralf@mandelbit.com> In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 4gv2M03kSlzDvmW X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "sfi-spamd-1.hosts.colo.sdot.me", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Currently, in ovpn_nl_key_swap_notify, the OVPN_A_KEYCONF_KEY_ID attribute is packed as a 16-bit value despite being defined as a 32-bit u32 attribute in the YAML policy. Fix this inconsistency by using nla_put_u32. Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-Headers-End: 1wghar-0006lt-F1 Subject: [Openvpn-devel] [PATCH ovpn net v5 2/6] ovpn: use nla_put_u32 for the key ID attribute in ovpn_nl_key_swap_notify X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox X-GMAIL-THRID: 1869965092953386530 X-GMAIL-MSGID: 1869965092953386530 Currently, in ovpn_nl_key_swap_notify, the OVPN_A_KEYCONF_KEY_ID attribute is packed as a 16-bit value despite being defined as a 32-bit u32 attribute in the YAML policy. Fix this inconsistency by using nla_put_u32. Fixes: 89d3c0e4612a ("ovpn: kill key and notify userspace in case of IV exhaustion") Signed-off-by: Ralf Lici Reviewed-by: Sabrina Dubroca --- Changes since v4 of this series https://lore.kernel.org/openvpn-devel/981d2ea51cca45138210aa52c6e5a0e55c0da7a0.1783099626.git.ralf@mandelbit.com/ - Add this previously posted standalone fix to the series so the whole set can be picked in order. - No changes since v1 of the original single patch https://lore.kernel.org/openvpn-devel/8577555cc95646d0bd58a5b78e59c7e6a9b1a0c6.1783058844.git.ralf@mandelbit.com/ drivers/net/ovpn/netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ovpn/netlink.c b/drivers/net/ovpn/netlink.c index 4c66c1ec497e..abf038206a62 100644 --- a/drivers/net/ovpn/netlink.c +++ b/drivers/net/ovpn/netlink.c @@ -1335,7 +1335,7 @@ int ovpn_nl_key_swap_notify(struct ovpn_peer *peer, u8 key_id) if (nla_put_u32(msg, OVPN_A_KEYCONF_PEER_ID, peer->id)) goto err_cancel_msg; - if (nla_put_u16(msg, OVPN_A_KEYCONF_KEY_ID, key_id)) + if (nla_put_u32(msg, OVPN_A_KEYCONF_KEY_ID, key_id)) goto err_cancel_msg; nla_nest_end(msg, k_attr);