From nobody Mon Jul 7 20:16:51 2025 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 4bbb9w4rzKz616ys; Mon, 07 Jul 2025 20:16:52 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbb9w1K4rz3Khy; Mon, 07 Jul 2025 20:16:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751919412; 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=ClpeLU8M7C4k4OvF2fAFTNssyL+GAUl2SDMvhzqrwdw=; b=IAaZb0VGmbNfc7BMoLpmQaC9djZV/sm3BSrkFLfVKq4qImv68wCzAxJCDb/2YbnkMLOfcc Qsru/9i7WpbKNuds+EKGiPyhUwtZdG9GDeKI4Ha33yKcE2BHHvj119ed2KGO79mHFHZl6F SVdP2XXYoCsI4HkPpBpbcI+/NHI+uZv/0hqXCJtorVsNn1u7iboWXEgBFYbtnOhImCcU1z mtEX4p9refAGN9pFuJvqpWn2jJfX0DWbyCl5937dnO7imiAvF8HqY6UOtLIJVrPDT2/Nnd iJ3nY1WMgFgTBBjBYp0HZUOjcPoMPjXrlfyAFSfqbhSRm/pLRo+vBh+3o8mO7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751919412; 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=ClpeLU8M7C4k4OvF2fAFTNssyL+GAUl2SDMvhzqrwdw=; b=p0fxbTVe++HCBhGLahtI++VM26IKXALTAPn2qrW7tPQ4nsg2MMCc3ggDfo0ER6Is9LRvPc ZULy/d4LHQZx+07zIfEO3MH0UU/qyrfeg922lz5tLhFiUZKNRN2ypXNI2wQtLO0IMsPp3v evM63RJ2S3FGM231gdd1JErkiqzHl2qgJsDT/DgxlnZvO4MEUGNn3JcJOjIXrdvedlG2/n Rz/cU8eW67ttuEIS9ZibLMOQ/nOCqRDA+9xgNlId/cjTdLT6/RWTrm+p9kyViZPOcJaxMj 7viEM/7davgpJAhfH2DYJgdg/H4+GwcRilk4DP5PtDsNB8gUVmR9+yhXdbztbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751919412; a=rsa-sha256; cv=none; b=UROKgp9X9M+JzqKb9Rgd2aIMn/HNXj5KOoIMBI0HWFiLETosNSJcE5EdkfyICVwW3WElJD QSvQprDW5xJ0gBadP9WvwtpgxEYub4HvEewln/Igc3K1kStikCaLTQlXdsrlvxFaz0YfDY 151Ap8mnPG8NWBuXVgepVclV0yQN52hS4qhsE1M/7erd/aPTqbqWAdAw0I+EhZcMeiN1Ox tDlPVN0P/CgBhQCwT+6bheJw+5zIcal1hvgmXUu7nzA9E4ceh+5w/HXtCcSqfhydv5L1oe I0UjehNaZqgX/7AVDdHf/1fDNXTedCjRGGDzqXrfLFUBqv6kGbDtqag0NFbv1g== 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 4bbb9w0gjSz14cg; Mon, 07 Jul 2025 20:16:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 567KGpcf006596; Mon, 7 Jul 2025 20:16:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567KGpNl006593; Mon, 7 Jul 2025 20:16:51 GMT (envelope-from git) Date: Mon, 7 Jul 2025 20:16:51 GMT Message-Id: <202507072016.567KGpNl006593@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: bc6b526e2b71 - main - inotify: Use memcmp() to compare embedded file names 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc6b526e2b71cf7e07806db5bc77926ed5c874f7 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bc6b526e2b71cf7e07806db5bc77926ed5c874f7 commit bc6b526e2b71cf7e07806db5bc77926ed5c874f7 Author: Mark Johnston AuthorDate: 2025-07-07 19:30:35 +0000 Commit: Mark Johnston CommitDate: 2025-07-07 20:16:31 +0000 inotify: Use memcmp() to compare embedded file names Otherwise gcc warns that strcmp() will read a byte from a zero-length array, though in practice we exclude that case with an explicit length check. Fixes: f1f230439fa4 ("vfs: Initial revision of inotify") --- sys/kern/vfs_inotify.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_inotify.c b/sys/kern/vfs_inotify.c index 9562350c897f..41e73bb41a49 100644 --- a/sys/kern/vfs_inotify.c +++ b/sys/kern/vfs_inotify.c @@ -503,7 +503,7 @@ inotify_can_coalesce(struct inotify_softc *sc, struct inotify_event *evp) return (prev != NULL && prev->ev.mask == evp->mask && prev->ev.wd == evp->wd && prev->ev.cookie == evp->cookie && prev->ev.len == evp->len && - (evp->len == 0 || strcmp(prev->ev.name, evp->name) == 0)); + memcmp(prev->ev.name, evp->name, evp->len) == 0); } static void