From nobody Mon Feb 20 20:13:04 2023 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 4PLDB84Ly5z3s6Zm; Mon, 20 Feb 2023 20:13:04 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PLDB83rNCz3KQn; Mon, 20 Feb 2023 20:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676923984; 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=pvLxZVpU7J899SfCq7fbANtylY71RigAEwO3VFeU99c=; b=T7kEGQ+p6kgw31CRc74qctcYtBcuwTyeipJx6m9WBkJ/QGMhyHkoIGKgELX8DLbasZ64r8 osNwrSWOBpknDv2+RsIzaGaU123ZVh/kR5ITcVQinU6fXeALFZHkvyWKwt7l45GuTpRUJa 2Y64HCX39ReqgId3ejMatFkad2LYWlJ+fXg0YUhBUDBzPy5ABinaU0K+Lp0ijPVl54RPAw 66NT+SU/mxoiAaQ0MhAfYhLxdiGPRsaEqZ2ab0tW9wY9oDypylLcljXk/2T4hGQuYuGPz7 9gdoEGjude+NhEndX828uejADSSKjUc34hsbo2qdx89iPBrlbuM3uhD0a93HzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676923984; 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=pvLxZVpU7J899SfCq7fbANtylY71RigAEwO3VFeU99c=; b=RX3Nd7PGcZ2XkDa834npvkz2P3cNcveEHxQaB0d7izWNwjzbpZ7rBmatMQgMeQvFsYCFkX spEfolfSyIvEr6uWWnoAaPgnkUcE07Am892kqREHl3YlQ3hUCN2u9YEYzLFzOraZ9kNnh2 eRmHwHlrgroWPXkOdI+gqP3cvicVhfu2thT/fAzaxCbIUpKue3vXFiEeqxA7MKGMpIVTrY Xyu3EqOJxLoluwU28jQIuyN016V8vWIgmThZPuYBqLuZNb19w2YA7W3s95z8/dWfd15LgV w+JlTrbp3yrMY2JNv7p88ED8iFKyjFiMFlHaurQK+c04Bca6zM6D//jzYzq6WQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676923984; a=rsa-sha256; cv=none; b=rTGRejjZ6qdiEtA/pDKLXHy9peWS2WrYofezMps3k5uQApeaBt7LoNZ4i1o5is0mOIGNhk 2oGM6O14KLRL6s6nYMLKp5guvE2GRkT1D0RbfZXAF2uRPkA2yETp/KfF5lCSwHfRmabNzY wmWAY66oDKAZMcF5U28tDz30qZmYLfssJ5s2SRkHhjkI7M/nKfCc2nTc2kwVLGC8rtIIUt kCGE/qu0yWwZv4xP2gw8tTpgkR45t8xQ0l9kmorCcCg0q6lG05MB6MAf1ta/xApPzqRih4 vo5Go+WN9RP6p98ZjtMPLlPD/jMDEpr/ZGCGVhZ3PsaPaiQOQ0SxhBVHUb2yog== 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 4PLDB82vpgztx0; Mon, 20 Feb 2023 20:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31KKD4Sq094031; Mon, 20 Feb 2023 20:13:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31KKD4Xw094030; Mon, 20 Feb 2023 20:13:04 GMT (envelope-from git) Date: Mon, 20 Feb 2023 20:13:04 GMT Message-Id: <202302202013.31KKD4Xw094030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 5eaad7c9c593 - releng/13.2 - netlink: Zero-initialize mbuf messages 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 5eaad7c9c593908dfd4ab7e665b66e0e19542e60 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=5eaad7c9c593908dfd4ab7e665b66e0e19542e60 commit 5eaad7c9c593908dfd4ab7e665b66e0e19542e60 Author: Mark Johnston AuthorDate: 2023-01-17 14:36:54 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-20 19:47:42 +0000 netlink: Zero-initialize mbuf messages Some users of nlmsg_reserve_object() and nlmsg_reserve_data() are not careful to fully initialize pad and reserved fields, allowing uninitialized bytes to leak to userspace. For example, dump_nhgrp() doesn't set nhm->resvd = 0. Meanwhile, nlmsg_get_ns_buf() and nlmsg_get_ns_lbuf() zero-initialize the buffer, so nlmsg_get_ns_mbuf() is inconsistent. Let's just make them all behave the same here. Reported by: KMSAN Reviewed by: melifaro Approved by: re(cperciva) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38098 (cherry picked from commit d91be0f1211b0196a0087cdfa237a6a0d2a43b65) (cherry picked from commit 13e997289240c4697536f904167720a29abf7a58) --- sys/netlink/netlink_message_writer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netlink/netlink_message_writer.c b/sys/netlink/netlink_message_writer.c index 37414703c6f6..6573394eb881 100644 --- a/sys/netlink/netlink_message_writer.c +++ b/sys/netlink/netlink_message_writer.c @@ -215,6 +215,7 @@ nlmsg_get_ns_mbuf(struct nl_writer *nw, int size, bool waitok) nw->malloc_flag = mflag; nw->num_messages = 0; nw->enomem = false; + memset(nw->data, 0, size); NL_LOG(LOG_DEBUG2, "alloc mbuf %p req_len %d alloc_len %d data_ptr %p", m, size, nw->alloc_len, nw->data); return (true);