From nobody Fri Nov 21 16:52:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dCh8X5dGrz6HSKb for ; Fri, 21 Nov 2025 16:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dCh8X4h9nz483J for ; Fri, 21 Nov 2025 16:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763743932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PCcRxuXWlYhIIZ+7qHyosSAcsUo7q6zgs402wySrjfg=; b=LovgXmo/MEXGCAvVd4ULP+osXgrWpRvh5wnRmaf66Lu7cfzpwpS8RtfsuSoZ850ckrquQA 1ofBPgrHjIeiZEEcjIZoIRZ6/RFr+JOzgWwn4GEEFtqLmdbf2XG6n4WEU91OIIa0RmvB2d gI2Er463LQZtOIifYcOUWC9KICUPKxTjmgA9lW7zsr8/pt8+FyrDpVcGWf8s3oGXncfJAP k/270MCX7QJO5pHl/KYB4PYh6Aka5oL9/pRDvNXpeZ0X+Xhm5OjznLbVJxP082K/P/RbJE FlwYmJjW045q1DjJ2BKz08BexaFkBc6I7qV5pRM01BG+HdnkAojtYfwHpDEogg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763743932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PCcRxuXWlYhIIZ+7qHyosSAcsUo7q6zgs402wySrjfg=; b=yEbsJbmDRX1bLr55t1u01dUSmqPYQ1i4MZXf/F+IM5gHuGLduPXEUCVK1cTJbtMYntFGT6 YsHRI8v94daKlNTZ9jmaZ41RnWUmBOPRlp/PrdRW3Y72ei/0DHxeZgD1j+DT8y82ep8MnC l8L4AtVJ0iRM3aj2po7ldGqb1T+/D6kFrD8UVbQMIEjM+gatoPLWHk5FCUYmk/yFvBeHX8 vm3P57dHT5T2+kckF0DSEHSvrfD1JJURd2kbJlHFYUnoIAqYqYEOz7FP1FeYUir6TSexqQ kVYB0usnT/rxuK0fFfkZqKmE/HJdJOsjJQPRdNop9nmD+7R37eXzLfhWq3PA9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763743932; a=rsa-sha256; cv=none; b=T0COXXoGWHOVBHH7J336j2tNguwOWdEPKxKvyYOBQRkNI2of9Ba6GQdEU/vJr8PaK12BpF jCkB7M8HibEHJrcv/bWrOH4FtZcvZYR1HVbOM3ip8fvmxPvCyaD+2aLm3gKyOKb4xaZJNE B1Qf5bSHzOFnIbg6hrLHJK8bQr3WIMR357Q5cW9VuBvWzyKWeYKOaQ/xWhsmQRJmpm+OoE uDF7gC2sye0OJ6FG4dqP+kWMoyD1oX4a4YVF0/y5NCU/ap6fIn0m0VhcyYyHH/c56Nan/L NfhahYM9cbfkJVuAz5xvmwZh4DLeF6RsxP57k5T6bKMs+DlqiQpvbcVRlUJaOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dCh8X457qz5Vy for ; Fri, 21 Nov 2025 16:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 996f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 21 Nov 2025 16:52:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Bruno Silvestre From: Gleb Smirnoff Subject: git: cf95eabb5572 - stable/14 - netlink: in snl_init_writer() don't overwrite error in case of failure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cf95eabb5572368c80d72c151ebebca8cf6b2dbc Auto-Submitted: auto-generated Date: Fri, 21 Nov 2025 16:52:12 +0000 Message-Id: <692098bc.996f.212beb76@gitrepo.freebsd.org> The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=cf95eabb5572368c80d72c151ebebca8cf6b2dbc commit cf95eabb5572368c80d72c151ebebca8cf6b2dbc Author: Bruno Silvestre AuthorDate: 2025-10-07 05:48:28 +0000 Commit: Gleb Smirnoff CommitDate: 2025-11-21 16:52:01 +0000 netlink: in snl_init_writer() don't overwrite error in case of failure PR: 290050 (cherry picked from commit 488718ff42346888243496c00cbeb42ba004171e) --- sys/netlink/netlink_snl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netlink/netlink_snl.h b/sys/netlink/netlink_snl.h index 03f2b7dc5c38..1a33a814c611 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -1025,14 +1025,14 @@ snl_init_writer(struct snl_state *ss, struct snl_writer *nw) { nw->size = SNL_WRITER_BUFFER_SIZE; nw->base = (char *)snl_allocz(ss, nw->size); - if (nw->base == NULL) { + if (__predict_false(nw->base == NULL)) { nw->error = true; nw->size = 0; - } + } else + nw->error = false; nw->offset = 0; nw->hdr = NULL; - nw->error = false; nw->ss = ss; }