From nobody Wed Apr 5 07:33:47 2023 X-Original-To: dev-commits-src-main@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 4PrxFl6MFcz4428f; Wed, 5 Apr 2023 07:33:47 +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 4PrxFl4KDdz47Mx; Wed, 5 Apr 2023 07:33:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680680027; 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=kDqnlY5p12H7asxMDxETgLcLNwjx134eu0vPX1M39x4=; b=Uzan7KVlOWOep4BfEs/0sqlzCtrqQLhhFBeiB4+zG3NMoEE9wrxozrcrDbcAvlufZoy1Li lGKdQ9UDhWeZREEuFzCxHLn22ibMUaWrSQhtZD9yzWM2OqO3MNvOCGfJ3IEmFbkAYFBV8a jlE87DZTH1wXZx8ic20rj2ZI9ZS9+ayaBQYV7L9wuuMc7sGueOADNlOrVdgnfqSgm0TMXO yTuAfPd5zJ/CtGv5VjiFthKGzmcWZZhbFeKALoNrb3apE3q6qPpvwmmeXfMsvaJaH/TGgs /evjRZ3vfhvmies2mc21uhANYUpNZfIBradlq3zC/RazuITfij5qeqIO9L9ChA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680680027; 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=kDqnlY5p12H7asxMDxETgLcLNwjx134eu0vPX1M39x4=; b=x0isZlgwaKyrg8jw8prY+MnHNEVrm7Ccy1pVkBhDYGrzntXvA1wuvAThiQDsEEM4pJSIpe Kjn58kae+FqO2O159uCozhUY//IrjtN0iIQ2tYJmLQhSUrIWUelTeW2wtm+e2LGCsxarzU eaxgerV90Py9RdFeziQZ+1jYz1CcHc1gRSAXuxL/oI+Z4VxwaDG9SgwSbD0zsUCjZB4aJl N82Y4Jlq/etxxnv88DsvsGBvjKawC+4rz3LlSFwBl/xs+QWHCkbaDJE04j0iWr8vOVhjnB LD7tG8NOtA2LwwECUr27EnMwDtHItNSkt67fNxc+cXx0w2u/lYfvGm809L+nHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680680027; a=rsa-sha256; cv=none; b=ipT9InD/l5R9S+y4OqzM3GVbZXlwRknR4ROVMxKq3nU8q5t48LETpkLGEK9Fsh6uoWG6KC bMSAOfNCo8pu1kRD+vL+/QTzbBzHzb4HoxV3zYEMHmDFD0MbD5Gaj9reSHWjGd34POvf89 Sts0ytVDSkK2a563Ark5GUXdsjKeuXj4mH4Ue3fjcA3DrlIbZdAUFdTA6i1kPZWrYiD+Op ib+/p088M5gEjs1JxEqqtszGM1IXI3bDAR6vcNvlGjaHYXqJ7pReMKz+XdmUn/uK3YpmF0 U0+TAEBN0piUXtYHtwcsXEVJFnp97nzIch9AuvGRjhpVivJlzRBsY8Eb3MRKtw== 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 4PrxFl3PZ9zDkw; Wed, 5 Apr 2023 07:33:47 +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 3357Xl4D093541; Wed, 5 Apr 2023 07:33:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3357Xl9E093540; Wed, 5 Apr 2023 07:33:47 GMT (envelope-from git) Date: Wed, 5 Apr 2023 07:33:47 GMT Message-Id: <202304050733.3357Xl9E093540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: eb1feadc201a - main - zfs: fix null ap->a_fsizetd NULL pointer derefernce List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb1feadc201ab7c4dc3aee9938e272c068179a5f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=eb1feadc201ab7c4dc3aee9938e272c068179a5f commit eb1feadc201ab7c4dc3aee9938e272c068179a5f Author: Martin Matuska AuthorDate: 2023-04-05 07:30:15 +0000 Commit: Martin Matuska CommitDate: 2023-04-05 07:33:32 +0000 zfs: fix null ap->a_fsizetd NULL pointer derefernce Submitted by: rmacklem Reported by: cy Tested by: cy, mm Reviewed by: pjd, mm Differential revision: https://reviews.freebsd.org/D39418 --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 97429b360a36..baa2ee5b3824 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 @@ -6290,7 +6290,7 @@ zfs_freebsd_copy_file_range(struct vop_copy_file_range_args *ap) goto unlock; error = zfs_clone_range(VTOZ(invp), ap->a_inoffp, VTOZ(outvp), - ap->a_outoffp, &len, ap->a_fsizetd->td_ucred); + ap->a_outoffp, &len, ap->a_outcred); *ap->a_lenp = (size_t)len; unlock: