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 881A71DE4C2; Wed, 19 Feb 2025 08:48:58 +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=1739954938; cv=none; b=iCpcaZ+Lc25+AWBFwtEMY1iUzbbhMID2LMIzY6k0DorPBkoBDpEnlOnIqcrT3n4oZWrJ6ubWCgXnGsJ+ZrwLIFkeBrGyOAsBOhKu85MbKSrI96OZPFHKQ3oxXxz7s2VfDtvwmQAcLSXR3SgJXzqf4ZEClchphH+AVj+ars+lSTM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739954938; c=relaxed/simple; bh=SjLoO5Wd5EInBYXfmzWnblnoq+AbC4B3Tt09UILspfc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jw96a+XZfdT0IzWrZ/tYWtyP/c7snL1F9GxEM9Xlu3muxevjjptm7gDd/FE043EV5+VmAnlOdbcevyxM0MpL9CccERfYce8bt3ntPaZgzD9uPVwKDg0qkwlQme6gpSY0s876SJD7hyNMm2cWk9CbOt9QTxRgDaMuC8nuuhu0TCg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tuseZqmY; 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="tuseZqmY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A1E1C4CED1; Wed, 19 Feb 2025 08:48:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739954938; bh=SjLoO5Wd5EInBYXfmzWnblnoq+AbC4B3Tt09UILspfc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tuseZqmYltECdwRHnxozY83Pi8prxizUlPp79WI5MGfGj/USWNlHjr01iT04Vd9JZ 33I+32pK+PgnSBhFujYBUKXLHnJeyhmZ1aYaHfYmB+ADx/cphW/czr5AJk+md2atUM Y168vqLyjWo50bdxE1kHSVltsrNpo3Qik1/hPrW0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zichen Xie , Benjamin Coddington , Anna Schumaker , Sasha Levin Subject: [PATCH 6.12 082/230] NFS: Fix potential buffer overflowin nfs_sysfs_link_rpc_client() Date: Wed, 19 Feb 2025 09:26:39 +0100 Message-ID: <20250219082604.909160592@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219082601.683263930@linuxfoundation.org> References: <20250219082601.683263930@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zichen Xie [ Upstream commit 49fd4e34751e90e6df009b70cd0659dc839e7ca8 ] name is char[64] where the size of clnt->cl_program->name remains unknown. Invoking strcat() directly will also lead to potential buffer overflow. Change them to strscpy() and strncat() to fix potential issues. Signed-off-by: Zichen Xie Reviewed-by: Benjamin Coddington Signed-off-by: Anna Schumaker Signed-off-by: Sasha Levin --- fs/nfs/sysfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/nfs/sysfs.c b/fs/nfs/sysfs.c index bf378ecd5d9fd..7b59a40d40c06 100644 --- a/fs/nfs/sysfs.c +++ b/fs/nfs/sysfs.c @@ -280,9 +280,9 @@ void nfs_sysfs_link_rpc_client(struct nfs_server *server, char name[RPC_CLIENT_NAME_SIZE]; int ret; - strcpy(name, clnt->cl_program->name); - strcat(name, uniq ? uniq : ""); - strcat(name, "_client"); + strscpy(name, clnt->cl_program->name, sizeof(name)); + strncat(name, uniq ? uniq : "", sizeof(name) - strlen(name) - 1); + strncat(name, "_client", sizeof(name) - strlen(name) - 1); ret = sysfs_create_link_nowarn(&server->kobj, &clnt->cl_sysfs->kobject, name); -- 2.39.5