From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 56E0619DF52; Tue, 16 Jul 2024 15:38:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721144298; cv=none; b=gcXFJof+2ObmsXpMXAzclNRAXON8E8VoVjFW0qoCIEcXstgii/UF0rB969QIje1XyEV1eFCob9aAXlHD6nutKlDGsH0Cs4pjy4ZhJrfs63vxKnrnHMIV+0MGxeddQFYJOMYj9ELQSP3lQZxoxZ7voSiHZ5wbVCn7iKku0b/bsGc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721144298; c=relaxed/simple; bh=gz7N2EmAt2kL8aIPrvpF7A7jeBQS1Z1canTxtibf+fI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AxjicLSRGXI+giIUqUhIJAwRdkUgOaUuYDzCorcb0RroDfq6hwWRuOr/5GsRBqNTukv8oRgQjnAxJsmPIYgWB6PBkV9HxMawsmvrO4hW5fxkcvoUkxkw2cK3ZYfxZL0GcLJHC5XeGxGjp0pLZMSTTU9A31tjIIplaXfIoyRGJVM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=G0n+nNOR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="G0n+nNOR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF886C4AF11; Tue, 16 Jul 2024 15:38:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721144298; bh=gz7N2EmAt2kL8aIPrvpF7A7jeBQS1Z1canTxtibf+fI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G0n+nNORPy+0j2GceIV4NZwAkanRSWAQl/sLntJGuD4UHqdj5Qocnr4SSJrsnKEuq th0IhS8mjg1fbMIaumFGwCc2FLzvAI37YvhtAVeAgpn2JXbJDpfmGmMiql+8DulEhw E2X00Lk1cMigfiBMw7FisOYeLT78lBdLUDqWDaLc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mike Marshall , Sasha Levin Subject: [PATCH 5.4 18/78] orangefs: fix out-of-bounds fsid access Date: Tue, 16 Jul 2024 17:30:50 +0200 Message-ID: <20240716152741.335087416@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240716152740.626160410@linuxfoundation.org> References: <20240716152740.626160410@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mike Marshall [ Upstream commit 53e4efa470d5fc6a96662d2d3322cfc925818517 ] Arnd Bergmann sent a patch to fsdevel, he says: "orangefs_statfs() copies two consecutive fields of the superblock into the statfs structure, which triggers a warning from the string fortification helpers" Jan Kara suggested an alternate way to do the patch to make it more readable. I ran both ideas through xfstests and both seem fine. This patch is based on Jan Kara's suggestion. Signed-off-by: Mike Marshall Signed-off-by: Sasha Levin --- fs/orangefs/super.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c index 2f2e430461b21..b48aef43b51d5 100644 --- a/fs/orangefs/super.c +++ b/fs/orangefs/super.c @@ -200,7 +200,8 @@ static int orangefs_statfs(struct dentry *dentry, struct kstatfs *buf) (long)new_op->downcall.resp.statfs.files_avail); buf->f_type = sb->s_magic; - memcpy(&buf->f_fsid, &ORANGEFS_SB(sb)->fs_id, sizeof(buf->f_fsid)); + buf->f_fsid.val[0] = ORANGEFS_SB(sb)->fs_id; + buf->f_fsid.val[1] = ORANGEFS_SB(sb)->id; buf->f_bsize = new_op->downcall.resp.statfs.block_size; buf->f_namelen = ORANGEFS_NAME_MAX; -- 2.43.0