From nobody Sun Dec 10 17:47:19 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 4SpC4l6x7Pz549Bh; Sun, 10 Dec 2023 17:47:19 +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 4SpC4l6QhBz3Wy3; Sun, 10 Dec 2023 17:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702230439; 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=GxPkIvEMArKm0bZgQqHgEnXro1U+GuLhWQ+cK+bi3xY=; b=vilhKEOqwEqxBfPM4BbPgInJOdZrxqvOKt7WYpuwMf/NMFuJKmnAT5IAxBxFcwKJeeCrxW VslH6HV/IHfDf1QrmTuzv61EnHdEAm0FUjM+2Yu2uw887feGzD7qNprI912QSyBn2JEKPI 1SebotkKFDBwMXvL5ayVHdQAKfA0lSpp6I+9EIc8AH4oo+kO20Ec5lq6bGpbc0zBgX/cJk Ieu4zIAvCowddtecosAgg/HjJ0VqRHq2GPDtEq4tyaCKisj8T4StyhWyXAAlWV02wMAvFR aWSC+ScKJahK3N17rF3B5XBNwFRG+LuHlHeQR/+vDYsiMoS7BeOa9ChiL1ZEgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702230439; a=rsa-sha256; cv=none; b=V7upSSaXu254MvR/G47T8/zceHTxYmeuilGPyfURtN3kdBMX+UlVImGUxhNqtkYLC8nb5M 5z0pcZ/P9v5YfXYmvInZMvb1iYjG1T0ECs587yV10bzTxmhrLxgEJu9yXtfEgP35Y8o06B ePre/EJFEppN0kcK/vPd91BTP7GU9oIyhzgTVDWY/rmpVmw5U3zf3W7UAoHmOtNkE5ktOA cKv/93269Vf2k8fRy2tbhae17A8rkIRY3jx1mwqx6X0ts6n0iNd57K4hhkx63jMQHyG2yw 3+RahE257AczHUzSnE/vd8etyO64KiBI/O2rzml4TeQ6CAqspBw6d72Noa7t5Q== 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=1702230439; 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=GxPkIvEMArKm0bZgQqHgEnXro1U+GuLhWQ+cK+bi3xY=; b=Q3cpDRraYqtm4pHdX9Q9tNkRbA5pOcn7K8eegCL9QFeze51Sm1x4cDCDlME6HuF4fbhVjl G40cy7zTjVgXJxPAq2jrjtoSViqXuxwtv0FPh7Voc8EM9KSplKHGasHCjdEuAB4AgKSbJP g05pJNNHYFqLSwK+ziDoy1VYbaA+xcQ19RRACgxX39jv0kdyn3Jo4/p6AbKjumGf2triyN nlaLvGeguBFNLqRCeaCibvp7bH2jQz8ip4py1lP5KbjbMMfiinhvpyQVefTG1aQxE1Cr3O ObN5XtjvQF2aJUvLoKyUYJ3NEpyn5llzS8tV8mlakZQocZxKkmCWvA5Y+9sKCw== 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 4SpC4l5T3HzxS7; Sun, 10 Dec 2023 17:47:19 +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 3BAHlJPZ008872; Sun, 10 Dec 2023 17:47:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BAHlJ1R008869; Sun, 10 Dec 2023 17:47:19 GMT (envelope-from git) Date: Sun, 10 Dec 2023 17:47:19 GMT Message-Id: <202312101747.3BAHlJ1R008869@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: c2b39a756fe7 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: c2b39a756fe7463cff5c715c2375700efef1e799 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c2b39a756fe7463cff5c715c2375700efef1e799 commit c2b39a756fe7463cff5c715c2375700efef1e799 Author: Mark Johnston AuthorDate: 2023-12-07 16:20:11 +0000 Commit: Ed Maste CommitDate: 2023-12-10 17:46:57 +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 3302f043620a..93bbfa8e3ef2 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 @@ -2007,6 +2007,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;