From a2258831d12d7845946f9c98f08d65aad9aa1121 Mon Sep 17 00:00:00 2001

From: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>

Date: Wed, 1 Sep 2021 14:09:17 +0900

Subject: [PATCH] PCI: endpoint: Use sysfs_emit() in "show" functions

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

Git-commit: 2efc459d06f1630001e3984854848a5647086232

References: jsc#SLE-19359

Patch-mainline: v5.10-rc1

Convert sprintf() in sysfs "show" functions to sysfs_emit() in order to

check for buffer overruns in sysfs outputs.

Link: https://lore.kernel.org/r/1630472957-26857-1-git-send-email-hayashi.kunihiko@socionext.com

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>

Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>

Reviewed-by: Krzysztof Wilczyński <kw@linux.com>

Signed-off-by: Oliver Neukum <oneukum@suse.com>

---

 drivers/pci/endpoint/functions/pci-epf-ntb.c |  4 ++--

 drivers/pci/endpoint/pci-ep-cfs.c            | 13 ++++++-------

 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/pci/endpoint/functions/pci-epf-ntb.c b/drivers/pci/endpoint/functions/pci-epf-ntb.c

index 8b4756159f15..99266f05739a 100644

--- a/drivers/pci/endpoint/functions/pci-epf-ntb.c

+++ b/drivers/pci/endpoint/functions/pci-epf-ntb.c

@@ -1937,7 +1937,7 @@ static ssize_t epf_ntb_##_name##_show(struct config_item *item,		\

 	struct config_group *group = to_config_group(item);		\

 	struct epf_ntb *ntb = to_epf_ntb(group);			\

 									\

-	return sprintf(page, "%d\n", ntb->_name);			\

+	return sysfs_emit(page, "%d\n", ntb->_name);			\

 }

 #define EPF_NTB_W(_name)						\

@@ -1968,7 +1968,7 @@ static ssize_t epf_ntb_##_name##_show(struct config_item *item,		\

 									\

 	sscanf(#_name, "mw%d", &win_no);				\

 									\

-	return sprintf(page, "%lld\n", ntb->mws_size[win_no - 1]);	\

+	return sysfs_emit(page, "%lld\n", ntb->mws_size[win_no - 1]);	\

 }

 #define EPF_NTB_MW_W(_name)						\

diff --git a/drivers/pci/endpoint/pci-ep-cfs.c b/drivers/pci/endpoint/pci-ep-cfs.c

index 999911801877..5a0394a38675 100644

--- a/drivers/pci/endpoint/pci-ep-cfs.c

+++ b/drivers/pci/endpoint/pci-ep-cfs.c

@@ -198,8 +198,7 @@ static ssize_t pci_epc_start_store(struct config_item *item, const char *page,

 static ssize_t pci_epc_start_show(struct config_item *item, char *page)

 {

-	return sprintf(page, "%d\n",

-		       to_pci_epc_group(item)->start);

+	return sysfs_emit(page, "%d\n", to_pci_epc_group(item)->start);

 }

 CONFIGFS_ATTR(pci_epc_, start);

@@ -321,7 +320,7 @@ static ssize_t pci_epf_##_name##_show(struct config_item *item,	char *page)    \

 	struct pci_epf *epf = to_pci_epf_group(item)->epf;		       \

 	if (WARN_ON_ONCE(!epf->header))					       \

 		return -EINVAL;						       \

-	return sprintf(page, "0x%04x\n", epf->header->_name);		       \

+	return sysfs_emit(page, "0x%04x\n", epf->header->_name);	       \

 }

 #define PCI_EPF_HEADER_W_u32(_name)					       \

@@ -390,8 +389,8 @@ static ssize_t pci_epf_msi_interrupts_store(struct config_item *item,

 static ssize_t pci_epf_msi_interrupts_show(struct config_item *item,

 					   char *page)

 {

-	return sprintf(page, "%d\n",

-		       to_pci_epf_group(item)->epf->msi_interrupts);

+	return sysfs_emit(page, "%d\n",

+			  to_pci_epf_group(item)->epf->msi_interrupts);

 }

 static ssize_t pci_epf_msix_interrupts_store(struct config_item *item,

@@ -412,8 +411,8 @@ static ssize_t pci_epf_msix_interrupts_store(struct config_item *item,

 static ssize_t pci_epf_msix_interrupts_show(struct config_item *item,

 					    char *page)

 {

-	return sprintf(page, "%d\n",

-		       to_pci_epf_group(item)->epf->msix_interrupts);

+	return sysfs_emit(page, "%d\n",

+			  to_pci_epf_group(item)->epf->msix_interrupts);

 }

 PCI_EPF_HEADER_R(vendorid)

-- 

2.26.2