[Openvpn-devel,net-next] ovpn: remove redundant peer NULL checks in crypto post functions
| Message ID | 20260907105902.3270608-1-marco@mandelbit.com |
|---|---|
| State | New |
| Headers |
Return-Path: <openvpn-devel-bounces@lists.sourceforge.net>
Delivered-To: patchwork@openvpn.net
Received: by 2002:a05:7000:57cc:b0:899:8fd4:d065 with SMTP id v12csp340542mau;
Mon, 7 Sep 2026 03:59:23 -0700 (PDT)
X-Forwarded-Encrypted: i=2;
AKwUvBw96hkqpsDmaZmIyKAWM24Q7o69+Xja4xe7O9jqZWNffPmBcdM6FjjkUlvCfW8arYwW0DQ3B05Ms8M=@openvpn.net
X-Received: by 2002:a05:6830:91b:b0:7e9:e808:e9c1 with SMTP id
46e09a7af769-7fa1ef0657cmr15586140a34.8.1788778763151;
Mon, 07 Sep 2026 03:59:23 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1788778763; cv=none;
d=google.com; s=arc-20260327;
b=jfe65iCoGovUAUdAKbGBLosTLntGW1UwIv6XfLr+nKXLD9eakChTbCueDXe0mwbSA0
BjuOD4ImVkKOgMy37Y/QWMyk020gRZanxwjyyAqxVuweGwl3DtkEO+v64v7DB3pNVK3r
LKh7uQuUrcoXTVyenLiG5ZFnwFnySdVJIo67CPL00YqfLF3MCOFH1mwrkGQ7tO+bPcoA
NPUDdA1D3sv419AR74/GGQxCYbVYJP8anHtROo3O8BLSKF+HelaOVMs+OMnomD6SI3oH
W0pF4SMsPhICq29q5LsCFLVu5YZjS2ALtFztt4uUa+UUmpeyIhr9W0IIoakkMr9Tj/i9
kCqg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20260327;
h=errors-to:content-transfer-encoding:cc:list-subscribe:list-help
:list-post:list-archive:list-unsubscribe:list-id:precedence:subject
:mime-version:message-id:date:to:from:dkim-signature:dkim-signature
:dkim-signature:dkim-signature;
bh=uDM/qUKshMat6P2RcYqyfiGPDvMvpMlsVZeyiZcr7C0=;
fh=BsMg/B0Yb/hS/rzP5Npz4luh0IleZm8REk1XWiWRt2A=;
b=fhErFWHHSC869bbW91COpTfBJnA/NTLInDYNMsyiUERzCIVE+/5hNRNIQq7VlMok8y
toJmbVeDJcNdPJ8RaKyPK8jFE9IoisoG4O1aD/MCZvfhj/3r1vWKXCENFn4PS77XCDZf
0HWAcU0wqeMnig7T5EUb+E0ss+ETUygdb6iFqw5pb6K2Dq8OS7VvM8Y2CklRaXbOtUyS
M7DcOY0TDfaubFpyuUzdPtQhc+qY90DrXRPBC+I9ReLKrutKsK5RKTwsUuB6HZmplono
KWp3q6/KIoo4M86eGsSH6KfmNq82nHV9G5Gou23SoALIsn07+aSu6jF7oZyzjCQ7Iisj
u2Vg==;
dara=google.com
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@lists.sourceforge.net header.s=beta
header.b=iCFFTnos;
dkim=neutral (body hash did not verify) header.i=@sourceforge.net
header.s=x header.b=ZzaZhTTS;
dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x
header.b=eoyBj2AR;
dkim=neutral (body hash did not verify) header.i=@mandelbit.com
header.s=MBO0001 header.b=11x2LUqH;
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
46e09a7af769-7f9f7e0ee92si17804250a34.113.2026.09.07.03.59.22
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Mon, 07 Sep 2026 03:59:23 -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=iCFFTnos;
dkim=neutral (body hash did not verify) header.i=@sourceforge.net
header.s=x header.b=ZzaZhTTS;
dkim=neutral (body hash did not verify) header.i=@sf.net header.s=x
header.b=eoyBj2AR;
dkim=neutral (body hash did not verify) header.i=@mandelbit.com
header.s=MBO0001 header.b=11x2LUqH;
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:Cc:
List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:
Subject:MIME-Version:Message-ID:Date:To:From:Sender: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=uDM/qUKshMat6P2RcYqyfiGPDvMvpMlsVZeyiZcr7C0=; b=iCFFTnosBh/MLh2kADt9Fh7vd9
K5dHA89T5WNF1b8xHRwkidbdpdsIy6r8mzrqrNs54dthDQHBeuAgIs4L4gKoKRlAJyuzLByEwHnBL
pj2K27dh+DsQnAYIvc+Re6edVu8i6FwHi0HuAH8m207BU6QVq9tbcS7n2zuk8HN0dx2M=;
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 <openvpn-devel-bounces@lists.sourceforge.net>)
id 1x3X4K-0000kO-7t;
Mon, 07 Sep 2026 10:59:17 +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 <marco@mandelbit.com>) id 1x3X4I-0000kG-G4
for openvpn-devel@lists.sourceforge.net;
Mon, 07 Sep 2026 10:59:16 +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: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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:
List-Subscribe:List-Post:List-Owner:List-Archive;
bh=1LF/SyvYYxlmMyYIg42TXzIgqdw4CptSyjvzk7Uhnlw=; b=ZzaZhTTSdPrLPbuT+VVLsbKyQD
AscWTH21c5o/64WseqmNLmk7WlNCC66vbSrpDzhJl4QBfahh7butTlJMJDHIEEeK9SpoC6lnxa4Yh
BffjjSYaTv1Q2uvRzdUegt6uEzLQj+5YA22qcGjZVk7SDBd0moaVyCjtWN8v2bVarAiE=;
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x
;
h=Content-Transfer-Encoding:MIME-Version: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:In-Reply-To:
References:List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:
List-Owner:List-Archive; bh=1LF/SyvYYxlmMyYIg42TXzIgqdw4CptSyjvzk7Uhnlw=; b=e
oyBj2ARkbJNL4NdJ/XH2Rt6dNu6Ahwyx+pxJtyDpZoR1ngubC58hKsv2CdW0d5wvfFnVjAgZ2hLVC
5glRFhuMAfsRh3FGeAyDZS8TxeY0BZui3Rtvyocw3CUsuGjKa87A3l65iPbeVugrb3jKauMIt/54D
Dvg1ExSJPC37t/hc=;
Received: from mout-b-206.mailbox.org ([195.10.208.51])
by sfi-mx-1.v28.lw.sourceforge.com with esmtps
(TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95)
id 1x3X4E-00021x-Nd for openvpn-devel@lists.sourceforge.net;
Mon, 07 Sep 2026 10:59:15 +0000
Received: from smtp102.mailbox.org (smtp102.mailbox.org
[IPv6:2001:67c:2050:b231:465::102])
(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-206.mailbox.org (Postfix) with ESMTPS id 4hdkbG70fzzNJ;
Mon, 07 Sep 2026 12:59:06 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mandelbit.com;
s=MBO0001; t=1788778747;
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;
bh=1LF/SyvYYxlmMyYIg42TXzIgqdw4CptSyjvzk7Uhnlw=;
b=11x2LUqHH5JCboLifB7ZDs/DLN0d8hxRQyD0lxNBYIYdsiJ/l1MnDOeQTOI0E2Eh/45fi5
cewV3WgYGSX+W838v5K8GUKS0SLYMzcQhldQgFOZPSKljQHdxcN9Jz3+KsFT+wbcf/zdoE
p+R1A6G9p4Xm70xjtyUc0U1Ua477LLokic1M40tnGtA83e1uvD6BFvOqEsJKinA7WJoWrf
yWvVet8935WfE2ptHOmaiQYGvb3ZYi3OXFqBx8GUseHQMXDhe/F3Ne+f+93eqcfD0y+2Qj
+j31uEIjYq3BijjlfsoPvPmyWCASjJEa/TF7WHOfDrXFF5HB05gV1u+axJhSTQ==
Authentication-Results: outgoing_mbo_mout; dkim=none;
spf=pass (outgoing_mbo_mout: domain of marco@mandelbit.com designates
2001:67c:2050:b231:465::102 as permitted sender)
smtp.mailfrom=marco@mandelbit.com
From: Marco Baffo <marco@mandelbit.com>
To: openvpn-devel@lists.sourceforge.net
Date: Mon, 7 Sep 2026 12:59:02 +0200
Message-ID: <20260907105902.3270608-1-marco@mandelbit.com>
MIME-Version: 1.0
X-Rspamd-Queue-Id: 4hdkbG70fzzNJ
X-Spam-Score: -0.2 (/)
X-Spam-Report: Spam detection software,
running on the system "sfi-spamd-2.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: The AEAD helpers set the peer pointer in the skb control
buffer
before any error return or crypto request submission. Both crypto paths hold
a peer reference until post-processing finishes. Remove the redundant NULL
checks before ovpn_peer_put() in ovpn_encrypt_post() and ovpn_decrypt_post().
Content analysis details: (-0.2 points, 5.0 required)
pts rule name description
---- ----------------------
--------------------------------------------------
0.0 RCVD_IN_DNSWL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to DNSWL
was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#DnsBlocklists-dnsbl-block
for more information. [195.10.208.51 listed in list.dnswl.org]
-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-Headers-End: 1x3X4E-00021x-Nd
Subject: [Openvpn-devel] [PATCH ovpn net-next] ovpn: remove redundant peer
NULL checks in crypto post functions
X-BeenThere: openvpn-devel@lists.sourceforge.net
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <openvpn-devel.lists.sourceforge.net>
List-Unsubscribe: <https://lists.sourceforge.net/lists/options/openvpn-devel>,
<mailto:openvpn-devel-request@lists.sourceforge.net?subject=unsubscribe>
List-Archive:
<http://sourceforge.net/mailarchive/forum.php?forum_name=openvpn-devel>
List-Post: <mailto:openvpn-devel@lists.sourceforge.net>
List-Help: <mailto:openvpn-devel-request@lists.sourceforge.net?subject=help>
List-Subscribe: <https://lists.sourceforge.net/lists/listinfo/openvpn-devel>,
<mailto:openvpn-devel-request@lists.sourceforge.net?subject=subscribe>
Cc: Antonio Quartulli <antonio@openvpn.net>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: openvpn-devel-bounces@lists.sourceforge.net
X-getmail-retrieved-from-mailbox: Inbox
X-GMAIL-THRID: 1875670479974180764
X-GMAIL-MSGID: 1875670479974180764
|
| Series |
[Openvpn-devel,net-next] ovpn: remove redundant peer NULL checks in crypto post functions
|
|
Commit Message
Marco Baffo
Sept. 7, 2026, 10:59 a.m. UTC
The AEAD helpers set the peer pointer in the skb control buffer before
any error return or crypto request submission. Both crypto paths hold
a peer reference until post-processing finishes.
Remove the redundant NULL checks before ovpn_peer_put() in
ovpn_encrypt_post() and ovpn_decrypt_post().
Signed-off-by: Marco Baffo <marco@mandelbit.com>
---
drivers/net/ovpn/io.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ovpn/io.c b/drivers/net/ovpn/io.c index 9526f8096da60..f14eb4e6c46ad 100644 --- a/drivers/net/ovpn/io.c +++ b/drivers/net/ovpn/io.c @@ -206,8 +206,7 @@ void ovpn_decrypt_post(void *data, int ret) drop_nocount: if (likely(ks)) ovpn_crypto_key_slot_put(ks); - if (likely(peer)) - ovpn_peer_put(peer); + ovpn_peer_put(peer); } /* RX path entry point: decrypt packet and forward it to the device */ @@ -305,8 +304,7 @@ void ovpn_encrypt_post(void *data, int ret) kfree_skb(skb); if (likely(ks)) ovpn_crypto_key_slot_put(ks); - if (likely(peer)) - ovpn_peer_put(peer); + ovpn_peer_put(peer); } static bool ovpn_encrypt_one(struct ovpn_peer *peer, struct sk_buff *skb)