From nobody Tue Oct 07 05:49:02 2025 X-Original-To: dev-commits-src-main@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 4cglZ70My8z69V7F; Tue, 07 Oct 2025 05:49:03 +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 4cglZ66Vdtz3bvT; Tue, 07 Oct 2025 05:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759816143; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QLaqU9+Amx5SFyaHohIOxDw6mPeA/WmkJbrXCuCmbYY=; b=lkxWY+CIhrjy/h6PLn6FHLg/FC1Raonr79SUKOpE2pZgv1yAgMFAhDRJghfocldAPousLk BzqpFePzRUSpbrwwqNaHmLhrmpk183UVynctbeL+GOR3KwDbjWUC5ebcDmu2DHeviMCynW 4sUPV3/0/JeHcupVGcnu3g1wZl10IpzghiDUFgXVM5u16oxgUld9O362B27oa8TP5SiV7E 4q6pZzQlcHjy7CFMQAbMJAw5MOEkpHwhCRgvNSI92YI89RO0BzpBERbwJLDfKjPXEuWLXA 9ucZ/I318F+qg3/+Yyqu5c81WV3V+ALMMGfCiRBF5M3DEPoirYcGes1N0l1IaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759816142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QLaqU9+Amx5SFyaHohIOxDw6mPeA/WmkJbrXCuCmbYY=; b=lcGyMBXIcpqt4iq4nQ2Hmi9a4Ft38yETG4nt2p5Mp/m7/Ex++3zUMgE+UplGdY/eRPReC6 4VyIxFUVEQ+2o9MatoM+/qIBVu1SnR4AD6r9lTGhYWmqags0JB8NE4N9C43wZZawd8qiaM ZenzijVKHG0ygSgfAxUz+0ibUGGo2du/FhZhzj4BDJcWIV4l44KWQqAkszkwqV1SD/swu/ Qu7knfRUrrN7t59BvO0MqdpGuFiWhQBmV1pf3kQ68VCbJLu1Z6xbEypKGrpD/QKbNBCE1q SUk2wU5dNOLV4Ut0XEVwoFajQVQCEIWt75qmdQIbiEVjt0+H9OopvJoRo2/Mbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759816143; a=rsa-sha256; cv=none; b=JgxS893Sisdve9IVh05rBt17q0msMgljDYgcSeeAE9JzNGzC3c7LTx9EBOTxpUXR1UyVCA V+swJ8zfJSB3SQaJdBrc4Itf+zerJ58N0Ij1EwQGaVip8q4X6FaK+NQQmIpIesaOzl59zA wwsuBI5pxVWGwukQ6NtbmqzI0fHNP9J0yqXA3988pa3WNczPQBPc4Wxxwdz+ju/YLTfaxl DfH31HTpBnR9JpexxuLbR8c+nSnfKBi5VZ48t/8ls6mAoezD15VctoVLZKOGOYxMreSMtk o84xbPS93tuAmQNbXc6FzzHDICO65wqaIw0FG6EywNNayj+nZrzL+cw/yk1Sug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cglZ65wFBzXr3; Tue, 07 Oct 2025 05:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5975n2PJ070672; Tue, 7 Oct 2025 05:49:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5975n2aM070669; Tue, 7 Oct 2025 05:49:02 GMT (envelope-from git) Date: Tue, 7 Oct 2025 05:49:02 GMT Message-Id: <202510070549.5975n2aM070669@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 488718ff4234 - main - netlink: in snl_init_writer() don't overwrite error in case of failure List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 488718ff42346888243496c00cbeb42ba004171e Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=488718ff42346888243496c00cbeb42ba004171e commit 488718ff42346888243496c00cbeb42ba004171e Author: Bruno Silvestre AuthorDate: 2025-10-07 05:48:28 +0000 Commit: Gleb Smirnoff CommitDate: 2025-10-07 05:48:28 +0000 netlink: in snl_init_writer() don't overwrite error in case of failure PR: 290050 --- 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 6dd8a9cbdb35..57f7e1e29d08 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -1068,14 +1068,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; }