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 D0A6C12E56; Tue, 23 Jan 2024 00:44:01 +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=1705970641; cv=none; b=t8NTIgEETUAtI9cZ3M4iGP+8QrWZ+mYk6ICh2Mkhe9mcC1ZQKAnFuGDCI1IZojLNs36DaoX3GCe6a62x2Be7SN4C2TZjupJfVN+hMtRNTL/BEPL2m+RliMHfUWbfZ4AgQvMtwmr9KXQMfUW3e/Sc+oOuIFnA5GoAaRbrvRP5RYA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705970641; c=relaxed/simple; bh=GuPyT0QaaotYAMPAoSOS9hS9zbhVMkk7irNel5oehSI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Nv94yQWcXHW4biv7jyTttg3v9N+O2FhF89i2RUgrKDFYP62idF9YJ+QucPsngYrYDgpR9GDjExluAKlMMv+oMQuV/WDqlxavA69+oTZhQGkJWBmwOAkl7rqqluGxOHuudn522ktQZT6oJ8aQKddN14rP1jA/43ehDN8syNYsdd8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=JjWhNO7l; 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="JjWhNO7l" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 813E0C43390; Tue, 23 Jan 2024 00:44:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705970641; bh=GuPyT0QaaotYAMPAoSOS9hS9zbhVMkk7irNel5oehSI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JjWhNO7lpMPjkykLJoo+ER1Ve535XEXfMk1QG3GnuQtdTxJNgYJkMqD91gfvkG/+2 BhpyOvlDR8onQ23AGwV9EzG+Acp056AiITPPRsIhghlVFMLmFUh/fxcFSJRIlQ9rQh jDux6IbzIy5MeqSthmAicU5PU52wKUz94uDPGuSs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christophe JAILLET , Dan Carpenter , Nishanth Menon , Sasha Levin Subject: [PATCH 6.1 076/417] firmware: ti_sci: Fix an off-by-one in ti_sci_debugfs_create() Date: Mon, 22 Jan 2024 15:54:04 -0800 Message-ID: <20240122235754.340802025@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235751.480367507@linuxfoundation.org> References: <20240122235751.480367507@linuxfoundation.org> User-Agent: quilt/0.67 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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christophe JAILLET [ Upstream commit 964946b88887089f447a9b6a28c39ee97dc76360 ] The ending NULL is not taken into account by strncat(), so switch to snprintf() to correctly build 'debug_name'. Using snprintf() also makes the code more readable. Fixes: aa276781a64a ("firmware: Add basic support for TI System Control Interface (TI-SCI) protocol") Signed-off-by: Christophe JAILLET Reviewed-by: Dan Carpenter Link: https://lore.kernel.org/r/7158db0a4d7b19855ddd542ec61b666973aad8dc.1698660720.git.christophe.jaillet@wanadoo.fr Signed-off-by: Nishanth Menon Signed-off-by: Sasha Levin --- drivers/firmware/ti_sci.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c index 597d1a367d96..6231c98ba291 100644 --- a/drivers/firmware/ti_sci.c +++ b/drivers/firmware/ti_sci.c @@ -161,7 +161,7 @@ static int ti_sci_debugfs_create(struct platform_device *pdev, { struct device *dev = &pdev->dev; struct resource *res; - char debug_name[50] = "ti_sci_debug@"; + char debug_name[50]; /* Debug region is optional */ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, @@ -178,10 +178,10 @@ static int ti_sci_debugfs_create(struct platform_device *pdev, /* Setup NULL termination */ info->debug_buffer[info->debug_region_size] = 0; - info->d = debugfs_create_file(strncat(debug_name, dev_name(dev), - sizeof(debug_name) - - sizeof("ti_sci_debug@")), - 0444, NULL, info, &ti_sci_debug_fops); + snprintf(debug_name, sizeof(debug_name), "ti_sci_debug@%s", + dev_name(dev)); + info->d = debugfs_create_file(debug_name, 0444, NULL, info, + &ti_sci_debug_fops); if (IS_ERR(info->d)) return PTR_ERR(info->d); -- 2.43.0