From nobody Sat Mar 05 19:56:51 2022 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 F422019FF4D5; Sat, 5 Mar 2022 19:56:51 +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 4K9wTv3cHdz3t1c; Sat, 5 Mar 2022 19:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646510211; 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=m79BKlQjZC7A5mnsIIsEJgub6Z/9ox0NreweFH8p54Q=; b=RdELcQrONJ7bkqXZPLKGvb18efML9vGfEY7RXyQZw+HsHC+o+eLU7v5ag3jKF7K+dbhqj4 p1NAuMoiKe9OfEgRcsa+lbc8UUJ//uELFWDVdrkAanx2uCSslU7ovL5ApIfJvBAqRWA1UG BmtDx66X8IOwXrNycHMUdY/l0kJ3ZT6+hqqPNnmwPRNqlbE1uhXD71AgxzJWDR9vniZTeO vseCxhat78kD009ONRdjG0J3hX/K4BCxgKbUcW9nMsrrBOOoEZFCnf4bH19TchhnaeMlf2 asdHdhJ6sdaFpgVy+Zk+9N6IP9jdCbaE9bk17hEzdOA0HnOP6Yi44pZx3tDdUg== 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 4058C25DF3; Sat, 5 Mar 2022 19:56:51 +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 225JupTo018132; Sat, 5 Mar 2022 19:56:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 225Jupmk018131; Sat, 5 Mar 2022 19:56:51 GMT (envelope-from git) Date: Sat, 5 Mar 2022 19:56:51 GMT Message-Id: <202203051956.225Jupmk018131@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: bac79d8e1646 - stable/13 - cache: only assert on flags when dealing with EMPTYPATH 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bac79d8e16466009afed9378dfe4e42adf46f4bb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646510211; 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=m79BKlQjZC7A5mnsIIsEJgub6Z/9ox0NreweFH8p54Q=; b=i6294FQEyGyfNG1HxgdRu6T18w2UB3W7FIctoz8QpsNE1R43VZ4nS121mhpPuy1qJNPMsR 8CqtAfRMcCswLfMH6oMPzdo1i2fzSu84C0x3ZVicudJWGhBZSGEiG1ggnao8FC12fyArfQ L5W7Tb75mVijZqj4ilu4D4MFByRuU0xZnkjpUtm9d4IrCauNFnV45dyK/XagN6TOPAbx1t PAqPXdqtx96isY6SFCXye7CNxMiAngP1fTqR2NCVj6NgbTPPT63kytox1E0Rwcxfa4NGi2 DlSMcRJfmRqmXWmykGnwohsfLWfyCF13im3AguJcpUeem0jvQhwPopdf9+FhkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646510211; a=rsa-sha256; cv=none; b=vxuuc+qCVOiVRYRZ2vTQNl+sjQ8ZmkcOET0KoB3Ximj0Vqs8Io8srdIg2J5MsMct3TmM62 elbIGx7475EGIWUpSu5heCITysOjJcAmv065N6+cvibrNx8TehL0RqctGKpJWT8Op6ASbY XmHrBBLh0ZpJYhjYywcRRQTcMrPAuzEGy65/VT8bxWUvoPE855Hy9GsmIbhwY3jySKwA7z qCIXx17OIqkPE7YYjxSDjVJUpj7PmpsI7GXnsXubJD/4nrAEkI/F1x17ybMB3EQHYcXbyc ZJPRHb9ubW0KItpRLqzzQTfIunfSzNcXLdiUsIweDxet3IT2uQM9KhHtjrnrtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=bac79d8e16466009afed9378dfe4e42adf46f4bb commit bac79d8e16466009afed9378dfe4e42adf46f4bb Author: Mateusz Guzik AuthorDate: 2021-10-17 08:40:16 +0000 Commit: Mateusz Guzik CommitDate: 2022-03-05 19:52:33 +0000 cache: only assert on flags when dealing with EMPTYPATH Reported by: syzbot+bd48ee0843206a09e6b8@syzkaller.appspotmail.com Fixes: 7dd419cabc6bb9e0 ("cache: add empty path support") (cherry picked from commit 1045352f150346ba422b3a3ce6344fc694bc3aa4) --- sys/kern/vfs_cache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 313879cf6d1f..14e148b2f839 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -4784,13 +4784,14 @@ cache_fplookup_emptypath(struct cache_fpl *fpl) tvp_seqc = fpl->tvp_seqc; MPASS(*cnp->cn_pnbuf == '\0'); - MPASS((cnp->cn_flags & (LOCKPARENT | WANTPARENT)) == 0); if (__predict_false((cnp->cn_flags & EMPTYPATH) == 0)) { cache_fpl_smr_exit(fpl); return (cache_fpl_handled_error(fpl, ENOENT)); } + MPASS((cnp->cn_flags & (LOCKPARENT | WANTPARENT)) == 0); + tvs = vget_prep_smr(tvp); cache_fpl_smr_exit(fpl); if (__predict_false(tvs == VGET_NONE)) {