From nobody Sun Dec 10 17:48:03 2023 X-Original-To: dev-commits-src-branches@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 4SpC5c0bXxz549Cy; Sun, 10 Dec 2023 17:48: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 4SpC5c05vkz3XRw; Sun, 10 Dec 2023 17:48:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702230484; 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=1poISVvrd3U4btueTtSVTTuv1sO26vbsQ9w/b0d8V2g=; b=I9UUC/1a4an8B4A9oHvThAhMnrecKZmbRxQ1vL6b8HK83b1FCXldqopEUbpF96r4OvgJbv X8bpCywR//6mmc8AyvltHVRlTVJvqVKbfY8lLQ1JNk0Jf9Rn1oJ7q9R7NITEAekKXqcHCg tc4Z6RxoUCs2b25ot7oV5os4MYNa2AAS9LVQH5UAOnVY8iUIPldFajOUtEey41/6N1iKoH TD1/DTnnkuqb56yyJdnL4lsqsiiIH09LFbbCf0wIK99HcfpfcvQGizAfVgO4wzfeM64ekE XamWyeTFr9XVQ9Arg506yQ9NucioooZskRyyGz2Xd9eCt0ogPiOb/BCJYQIPSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702230484; a=rsa-sha256; cv=none; b=QqeyP1XjRKgP/m+JZO1CNm/6AJOUT8VTSWOoDC93sMV64V3vcPPVfZHeMX2dGHM7bSteiK FduuJ6LRKl/za9a0QCXegLyZoVq8udf8naJeRt+JaY0MyvDABK3zDbMhsQGa+ik7exPyng GsX2oz/LinnUtis28e/25lzmLHm2QlzjST5HmiVr8SsbnJL7KlKiJ5LAw+sNpwR438q8fF 8PT+RcD7VOx4I64hkJhvSJEigUZ+D7fekKKCOwTxQOg+2Yh1SwmswS8Xn4ZRN9Se7hCjzp 8mZ/ivMBUCYytAxuZt7rKylLsqRA7TQH7WI6tY5gBS95M903XXOPzfC5o3c5zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702230484; 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=1poISVvrd3U4btueTtSVTTuv1sO26vbsQ9w/b0d8V2g=; b=Bsw93khoWUocOTohVVBvEPFA8924f/FJ4Ya8+gvNlYYDsw5mCX4GQ8ZEKWQjmjdjITTb1O WkIFoQPH7B1+rCnXJC4rCu/nMocifFn/eUM8qKqVti09/G8hbT4vqbZnNF7vwPQ+ySPX3n i32ZG2fnHzCV4ToIYGc3pQyC/qXNYae7e90n4rxtdAPXE7uxgeUG9hZXmSwQA/HAC2CdTc tEtpkkM/cZ0sf6F6ITFqrg4LUWyqxDnQYBM8QNd9ZDb8E/tAWrIyBlVYDC2hLggHxOHCgv 4p1UiNJKbAqJzin4JuJO//7fQMwwghOF/nt9DPqcYuOySodVX+ytKriQXUxeoA== 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 4SpC5b6Hq4zxkg; Sun, 10 Dec 2023 17:48:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BAHm3IO009151; Sun, 10 Dec 2023 17:48:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BAHm3SZ009148; Sun, 10 Dec 2023 17:48:03 GMT (envelope-from git) Date: Sun, 10 Dec 2023 17:48:03 GMT Message-Id: <202312101748.3BAHm3SZ009148@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 5a23e4aa88e4 - stable/13 - OpenZFS: Ensure that zfs_getattr() initializes the va_rdev field List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5a23e4aa88e4bf412bf3650b8536140a34e754d5 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5a23e4aa88e4bf412bf3650b8536140a34e754d5 commit 5a23e4aa88e4bf412bf3650b8536140a34e754d5 Author: Mark Johnston AuthorDate: 2023-12-07 16:20:11 +0000 Commit: Ed Maste CommitDate: 2023-12-10 17:47:28 +0000 OpenZFS: Ensure that zfs_getattr() initializes the va_rdev field Otherwise the field is left uninitialized, leading to a possible kernel memory disclosure to userspace or to the network. Use the same initialization value we use in zfsctl_common_getattr(). Reported-by: KMSAN Sponsored-by: The FreeBSD Foundation Reviewed-by: Brian Behlendorf Reviewed-by: Ed Maste Signed-off-by: Mark Johnston (cherry picked from commit 11656234b560c401dec6a16e1bf048b20fd31aac) --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index ea6388dd515e..53126fdd6ec9 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -2067,6 +2067,8 @@ zfs_getattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *cr) vap->va_size = zp->z_size; if (vp->v_type == VBLK || vp->v_type == VCHR) vap->va_rdev = zfs_cmpldev(rdev); + else + vap->va_rdev = 0; vap->va_gen = zp->z_gen; vap->va_flags = 0; /* FreeBSD: Reset chflags(2) flags. */ vap->va_filerev = zp->z_seq;