From nobody Wed Sep 17 12:18:55 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 4cRd9D23fcz67HMp; Wed, 17 Sep 2025 12:18:56 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cRd9C6YCNz3VG0; Wed, 17 Sep 2025 12:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758111535; 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=F3WP15UudDvkVRhB9maTj1fkiTZNbikL+QsNm0gvzp0=; b=AUjVY2w05CMtJMuAyHlzQ3tlqASZzoamcf+CdhWfgw58mzpg0M33vLPqhiqu8rPe2ERdso yO7kNR4eCveSf6qe4+CEfGWdS+ztXti+LpoBZ/CiJJYIfzPqqX4MLW4ZCu1s+nz2aGXsEY vAiC1YBXXLpOHFDXaCm3U8FW+3uAK2rZoifEk3U3Y+eUx3RTJPkXvgY3XIRU6PGPwL31fb g8MZvo0HNBK+sQWZMB33NaqGaZMSgCJ5t/BK401UAGoPwf0d+dp5/ThAfnVJ3+8cKf6zYd BdETdBY4fY7QSYFnqVdFcIa7skrr9dEdL3GllgY4seaL+QdKQV1VRUHU8PuXfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758111535; 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=F3WP15UudDvkVRhB9maTj1fkiTZNbikL+QsNm0gvzp0=; b=JDEwIV8RSF/2l5aTZdbLg2+hKixFGMbZL4WjlUChFcpSNjC6tYq0eHuD4PKIiZKnUrIKty Uk/xrUZ4tSfbdZIugZGGqF0tEV8lrHCjooCTN1QQPIsmTOxIUdSHYau+vlRjpXzRN5E+A1 WYk0ryCMF8aA3Av7/EPNQ48zCKV9nMnT3LEp4rppR4UfbBf1Yo0t0mo+hydwLcYaSiEFSp HlL39MPI0iUDo55q2NGi0RR1jWUJOTjKQWiWWx/77TWRynVPUUEaLRYkFnTs7uem6TIGG0 wmUMYB5P/Chvdfz2sSfZ5JEtvRPPXgxoBxqbIaU9stMlr44qXeO1H7YAXaE8rA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758111535; a=rsa-sha256; cv=none; b=LPQyzCph48+2jW7Zuj7XppCOXmiEb3wXtxVmy0XJC+mMIxU0WpXBFvdf8f1jtUTlnQs6En pY9b8iTrnFd3/6aXrmmJhRhxLwWbgBOrTJdrQ0xfpvsgA/JBt1NjAUBqn39MWu9XuVZfGo XmQoT0/03r2seGo0tlEHg+OWQ6Qu2JYMvcZ/tmnj6XaD52xf9umamDQpX8UClzxEnotVhi X+MusElYzBEk2hZUZJ9N6y5o0NsggwrQya3K7NiyiWDWv/I5UpVz9j0k9/+/X9RkJZKQ8O 7BWdMPsrlVTihDf5M2zRTU1QePTOZP2eVZapryiFmMKppea+seIXTNn/+4PQLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cRd9C68c0z9jx; Wed, 17 Sep 2025 12:18:55 +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 58HCItbA085451; Wed, 17 Sep 2025 12:18:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58HCItZU085448; Wed, 17 Sep 2025 12:18:55 GMT (envelope-from git) Date: Wed, 17 Sep 2025 12:18:55 GMT Message-Id: <202509171218.58HCItZU085448@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: d22592cd6fd2 - main - fuse: Fix GID when sending FUSE_INTERRUPT to a FUSE daemon 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d22592cd6fd2d39432add376dad460a66488a846 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d22592cd6fd2d39432add376dad460a66488a846 commit d22592cd6fd2d39432add376dad460a66488a846 Author: Olivier Certner AuthorDate: 2025-08-26 12:39:16 +0000 Commit: Olivier Certner CommitDate: 2025-09-17 12:16:01 +0000 fuse: Fix GID when sending FUSE_INTERRUPT to a FUSE daemon Due to the partial-only changes of commit 46c07316f906 ("kern: adopt the cr_gid macro for cr_groups[0] more widely"), subsequent commit be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]") caused a mismatch between filling cr_groups[0] in 'reused_creds' in fuse_interrupt_send() and reading 'cr_gid' from it in fuse_setup_ihead(), with the consequence that the kernel would send a FUSE_INTERRUPT message to the FUSE deamon with an uninitialized GID in its header (which, besides being wrong, would disclose 4 bytes from its stack). Fixes: be1f7435ef218b1d ("kern: start tracking cr_gid outside of cr_groups[]") MFC after: 5 days MFC to: stable/15 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52255 --- sys/fs/fuse/fuse_ipc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/fs/fuse/fuse_ipc.c b/sys/fs/fuse/fuse_ipc.c index a751c09159ff..7f754ab7f1d4 100644 --- a/sys/fs/fuse/fuse_ipc.c +++ b/sys/fs/fuse/fuse_ipc.c @@ -193,7 +193,6 @@ fuse_interrupt_send(struct fuse_ticket *otick, int err) struct fuse_data *data = otick->tk_data; struct fuse_ticket *tick, *xtick; struct ucred reused_creds; - gid_t reused_groups[1]; if (otick->irq_unique == 0) { /* @@ -237,8 +236,7 @@ fuse_interrupt_send(struct fuse_ticket *otick, int err) */ ftick_hdr = fticket_in_header(otick); reused_creds.cr_uid = ftick_hdr->uid; - reused_groups[0] = ftick_hdr->gid; - reused_creds.cr_groups = reused_groups; + reused_creds.cr_gid = ftick_hdr->gid; fdisp_init(&fdi, sizeof(*fii)); fdisp_make_pid(&fdi, FUSE_INTERRUPT, data, ftick_hdr->nodeid, ftick_hdr->pid, &reused_creds);