From nobody Sat Jan 14 18:49:00 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 4NvS4D2zwkz2skwM; Sat, 14 Jan 2023 18:49:00 +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 4NvS4D2RmJz47RH; Sat, 14 Jan 2023 18:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673722140; 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=wDHBGyM0tqlJAnkut1R1aPENBTp8yx3lh1qreBSEqM8=; b=BXk9bDceMdtkxjliX6AbYIiEyXIwlTandTYvid7DBxT2kRjbPBrQRcex6AmZnva+P+QZIC dr+2Gr1p5/faTcyJedbL83aOhV4B/t7M/QIxsEzGO9Ur5fhknQewQJe2sCDJNB6aabfKkR Rzn6vpk+ggDFm0pmsMA3r2DwtvupZxoH+2dm3fuHUw0kMHB6coCu2f8NlslN0v/yBkgumr WtVH5XJsmKYqWk8dSzUAuMq6OxFWlmboa5TVy47WhjLhkg7v98EDW1pgYb99aJrGvvSPrB LBRG+FYsJyZVZnIDHcia8GkV5+HNj++UlBPGb0P3HKDTeZ/SwuqsmgqVFeVJtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673722140; 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=wDHBGyM0tqlJAnkut1R1aPENBTp8yx3lh1qreBSEqM8=; b=UzQFTm5Y9HSA8GCClVAWfhbfarkUGFOk5RKArOuv1x5o7usy/6cRfYkqoPrCZOTGozR6Ps PfQkNpnp5VeQXBWA2dYlS4Aeg8kQUvsd27J/2xV+sE8qVvCaynX83wQTAWi2MkhGEHmUEG cBESS+815pBfUKxPkTCUVTkT6nVQKz+Y5b6Qrv9nxmvwOsG3E40FQEv8cdeujT/r0Q1298 VYL5Po7LuRS9/bL8qok7ay63uZPlbP7AgNoaS4v9YUmT9plerVZMYpo71N8f58b9ZgGVbo MeksbD2kU1+QGFrsyiKATiDuJEaACvNZEAwaRLMdNR1jNApy0O4w8/2YEDOWrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673722140; a=rsa-sha256; cv=none; b=R4WzPpg/6KfoQsbPYrz5rdL3tToPw616Gz5xTxSa/OJGKuCWpLetOXax7Z+im4LlyapKxY 8mhBMK6UHz2g3GrxtEmJNWdIcImQkQcC+OwgrNNtk2rNkj0lHYqTsd/PM2GlnItS4sNYTp D0/tGPUHkyK2evi/4ME/AesBO63Cdaxaa12wOwmYr+FrhTcoIxezXWTQlpd0fhpM2ENwXz J9cuqlTczLk511oPE8hqaNoPTKaYizAXUDMC7exidJaP1pFHrht309A13yjNxU/BWiPSYR LOHVYN9pqDHjjEj3L0Soo5uDo0IYtDsaAMoSdqq2uSah0MUdbI+1oWlNAgWqlg== 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 4NvS4D1VD8zy5x; Sat, 14 Jan 2023 18:49:00 +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 30EIn00c077621; Sat, 14 Jan 2023 18:49:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30EIn00e077620; Sat, 14 Jan 2023 18:49:00 GMT (envelope-from git) Date: Sat, 14 Jan 2023 18:49:00 GMT Message-Id: <202301141849.30EIn00e077620@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: caf4d617945e - stable/13 - Fix vop_readdir's ncookies handling in UFS and EXT2. 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: caf4d617945efea8c59443d8ab184c288bae43be Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=caf4d617945efea8c59443d8ab184c288bae43be commit caf4d617945efea8c59443d8ab184c288bae43be Author: Kirk McKusick AuthorDate: 2023-01-02 03:29:43 +0000 Commit: Kirk McKusick CommitDate: 2023-01-14 18:48:48 +0000 Fix vop_readdir's ncookies handling in UFS and EXT2. Submitted by: Kusumi Tomohiro PR: 267706 (cherry picked from commit e84e44215fe19dad4d1779d5ee0b2f2d2739f016) --- sys/fs/ext2fs/ext2_lookup.c | 2 +- sys/ufs/ufs/ufs_vnops.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/ext2fs/ext2_lookup.c b/sys/fs/ext2fs/ext2_lookup.c index 68482e38feb8..7be45a9945f2 100644 --- a/sys/fs/ext2fs/ext2_lookup.c +++ b/sys/fs/ext2fs/ext2_lookup.c @@ -272,7 +272,7 @@ nextentry: error = 0; if (ap->a_ncookies != NULL) { if (error == 0) { - ap->a_ncookies -= ncookies; + *ap->a_ncookies -= ncookies; } else { free(*ap->a_cookies, M_TEMP); *ap->a_ncookies = 0; diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 71cee6ad7181..93ac04941db7 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -2528,7 +2528,7 @@ nextentry: error = 0; if (ap->a_ncookies != NULL) { if (error == 0) { - ap->a_ncookies -= ncookies; + *ap->a_ncookies -= ncookies; } else { free(*ap->a_cookies, M_TEMP); *ap->a_ncookies = 0;