From nobody Wed Oct 15 18:59:26 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 4cn0kQ1p1Sz6CqjV; Wed, 15 Oct 2025 18:59:26 +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 4cn0kQ1D5tz4GW9; Wed, 15 Oct 2025 18:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760554766; 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=ejf5ncxBN7IejVBYWPza2CAgjkzRxe1r9rOqrDQoaCs=; b=eQ7XdxeffjS0cFMcY8bhUNktn534m8K0i40ZKyIq+FwSGcndVmOptaL5Ac90vyQ3vvx/8a T0rAtVHOEuaDnwZvUcUbWocG8gXc+M3q4o4qphUNrRncexbZVDw+wpkATilj5OiDMePBfu n7FqZZB/cy7mapccke/FQIuehFTn9CBq3BGZrRCcLkzXg5fuLuDA4ZQ/8pTN7wENVVybhT gb5T3wDErV2bfvKs37R2n9DSGrj/VFzlSj3FHKSeegq056fL3+sIW3y1H9KI45IKLGiAFK zWh74E9dYcK68hYvGq1FfVy4QgqhBEn7P/cLTiZnNarLJBolryDQVlVWJ/rbdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760554766; 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=ejf5ncxBN7IejVBYWPza2CAgjkzRxe1r9rOqrDQoaCs=; b=BmwrEKpPEQPrhxggB99CVeH5oeovZIyqudDwOa+UEtGsrW4S95YVudvIIZtDzv6Jr2uZ8E +VV6yQ52MDDIMHZdXLkBMp0UFumYufov5Yfsef1VFdxZuC+8+NtbIKnJ9oDf5mo3k1+1QK AaY/p2MG+/G0okm0WPg0HjT75oAPTvp5U0Q28ki0i0VoU637fhFapA6XhcV74d1eRtA9et S63tKkiReSYu9/bwBL/D816Yg1xcO2npoPx67t6BIc+4kzJRvzCTDcc0cLLibqhnKDdAng 8g16NO6QhD9TNXLzQUiEF6TgITv+FsL36uk38Nwu09UQ0okDFUFmPVvATjxbZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760554766; a=rsa-sha256; cv=none; b=c+QKnK/IxiaA3qYa/21zTXMnEVZrJpJ/9bdj7VFcP8n+MBXivkSnQQY2C+tHca8yvjG16W 0gKxkhi9zs3njOMZl2DqWaZna6uQ6yoDDZhcZ3Szfc+7Fkd4B+2slQfE/LuTebFYhqdIWg IyplgojIrVB7nsoTG9XkSBrX6fQOz9iffldaVa38Fk70aJa9UiNa2c7oBcgq3fuXj/Juti 84Y6kWIuDvwJ5wP41LsziBd3wfTGwhQhLF0zHIMWt/4gEGQFj6LgKhVsHtThFrsCGZIkpg rmrq8zCPfZbOqLc7bY0X2Vqs5mzYNDA4R8kIH+mt7uH/eizr2jiPLXDUnn4k3g== 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 4cn0kQ0mDtzrT1; Wed, 15 Oct 2025 18:59:26 +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 59FIxQ95074286; Wed, 15 Oct 2025 18:59:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59FIxQ5U074283; Wed, 15 Oct 2025 18:59:26 GMT (envelope-from git) Date: Wed, 15 Oct 2025 18:59:26 GMT Message-Id: <202510151859.59FIxQ5U074283@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: 794299ac6876 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 794299ac6876ecdf62e503d3fb05bd388f5c8be7 Auto-Submitted: auto-generated The branch stable/15 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=794299ac6876ecdf62e503d3fb05bd388f5c8be7 commit 794299ac6876ecdf62e503d3fb05bd388f5c8be7 Author: Bruno Silvestre AuthorDate: 2025-10-07 05:48:28 +0000 Commit: Gleb Smirnoff CommitDate: 2025-10-15 18:57:46 +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 586716776bc5..ca1169d24b91 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -1057,14 +1057,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; }