From nobody Sun Dec 10 17:49:43 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 4SpC7W6j3fz549D4; Sun, 10 Dec 2023 17:49:43 +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 4SpC7W68FPz3XZ8; Sun, 10 Dec 2023 17:49:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702230583; 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=wsG/+Ir8TWnABo5uEXUU0s+3OD+DXp3AjKvjfsYroOc=; b=wesp34jQRhO+bIr82opG7k5GoFjJe+66cB5Q/3Ds7A6WYKq5InWbh3sC4X7kFXT2JQ82xV G90lhPWTPXC4YWm4Fn1wJmFbDNcoOzZtb6z508XCa624YSzxAVAnUT4UbPMa2Yl1juYmcY OR4zff5Nf+wP5dvNGb2kBzUUj2Ihv0J7nFJxjp8Y8MUInyAtKMB09+bFtOu/i0QbUY+/OZ q+7t5v0GlqrGYcF+wPrH+M0V/sEJwHZMzeSGJHhzTjE/qA1LlxmrNH6rdZaoi4jLyfyoJq X+USxHffD8H2xq56kTjsZ+khiW/hvCgpKyA4vO9H2hs6S08syrh2x0i2oLwu3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702230583; a=rsa-sha256; cv=none; b=qYJSlhjLZj9POvX+57MiUn1oos/uCqykpnf8ra88Fgf7IQhvGknChKGQTfPPfMlVgRqM8O PkUk3X99lS/NDQlMCX+jTRQPSaXhvKiLjT8c3P8GiSkEfvJS0VIikRVwkepL1d2CPah47C OKAW+0zyaebrsvT+0W06nPKZjB6bzfbc5Q9QPvIXyO7G85Ey/c9yejzioeuO9NBQC4EOkA 7mst9RWgFjAAxNHWb1Q7ZAv7LcZNiLmCh2uf0em+AhoUOzTSkfE0a9bCDTfaAMJnRbr9BR HL1Inb/oFTkG42QglQxLXZa1i74ehFjLBkAFPDhXnWjMS99/r00WVHLgd9pOJg== 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=1702230583; 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=wsG/+Ir8TWnABo5uEXUU0s+3OD+DXp3AjKvjfsYroOc=; b=OGWGZFgMOnAoXEa5oT+7NX80Injh+lXvv4egaPMW5qEjSdgCxxAPihI6+PSKpwVF8DNy4Y riL4RifdlhnuBFIoW05OH/HWacp/ilYcPM08P5empKDRtolwPu8vP8pAxzn8iBth2rTl9R opazuxunxAak3EgIJOwrPjAW0RR2jHW/YKI0PZHcEuS141zJlUhhX7fNenrRYg7pE0n0wS FvmeZfzf2hg72xiY2NTs95peOd5tA50TK00N+vM6RTINdTDkdnpyRpP65DGyiPteAxWk9G Vs+mZd4gCZFoL7nj3JCXVguV4xTzzsPgII1CM63q2CyI7HywgP0qqoifkxd0Nw== 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 4SpC7W5D7Szxkj; Sun, 10 Dec 2023 17:49:43 +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 3BAHnhRD009564; Sun, 10 Dec 2023 17:49:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BAHnh7E009561; Sun, 10 Dec 2023 17:49:43 GMT (envelope-from git) Date: Sun, 10 Dec 2023 17:49:43 GMT Message-Id: <202312101749.3BAHnh7E009561@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: a9dcfac2fd6a - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: a9dcfac2fd6a26671b707d15727935ed24c681b5 Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a9dcfac2fd6a26671b707d15727935ed24c681b5 commit a9dcfac2fd6a26671b707d15727935ed24c681b5 Author: Mark Johnston AuthorDate: 2023-12-07 16:20:11 +0000 Commit: Ed Maste CommitDate: 2023-12-10 17:48:51 +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) (cherry picked from commit af1e8b52d26502bac9a2484b87d1879334debd67) Differential Revision: https://reviews.freebsd.org/D42987 --- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c index c61714bb358a..34f3476c2064 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c @@ -2735,6 +2735,8 @@ zfs_getattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *cr, #else if (vp->v_type == VBLK || vp->v_type == VCHR) vap->va_rdev = zfs_cmpldev(rdev); + else + vap->va_rdev = 0; #endif vap->va_seq = zp->z_seq; vap->va_flags = 0; /* FreeBSD: Reset chflags(2) flags. */