diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-05-13 15:35:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-13 15:35:58 -0700 |
| commit | fcdf818d239ee38c258a2ad56f9e49834d23f402 (patch) | |
| tree | 73d8849b942454df345de2b5243ad644e6694093 | |
| parent | tty: vcc: Fix error return code in vcc_probe() (diff) | |
| parent | sparc: use scnprintf() in show_pciobppath_attr() in vio.c (diff) | |
| download | wireguard-linux-fcdf818d239ee38c258a2ad56f9e49834d23f402.tar.xz wireguard-linux-fcdf818d239ee38c258a2ad56f9e49834d23f402.zip | |
Merge branch 'sparc-scnprintf'
Chen Zhou says:
====================
sparc: use scnprintf() in show() methods
snprintf() returns the number of bytes that would be written,
which may be greater than the the actual length to be written.
show() methods should return the number of bytes printed into the
buffer. This is the return value of scnprintf().
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sparc/kernel/pci.c | 2 | ||||
| -rw-r--r-- | arch/sparc/kernel/vio.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index 5ed43828e078..a41ad562ed4e 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c @@ -593,7 +593,7 @@ show_pciobppath_attr(struct device * dev, struct device_attribute * attr, char * pdev = to_pci_dev(dev); dp = pdev->dev.of_node; - return snprintf (buf, PAGE_SIZE, "%pOF\n", dp); + return scnprintf(buf, PAGE_SIZE, "%pOF\n", dp); } static DEVICE_ATTR(obppath, S_IRUSR | S_IRGRP | S_IROTH, show_pciobppath_attr, NULL); diff --git a/arch/sparc/kernel/vio.c b/arch/sparc/kernel/vio.c index c7cad9b7bba7..4f57056ed463 100644 --- a/arch/sparc/kernel/vio.c +++ b/arch/sparc/kernel/vio.c @@ -193,7 +193,7 @@ show_pciobppath_attr(struct device *dev, struct device_attribute *attr, vdev = to_vio_dev(dev); dp = vdev->dp; - return snprintf (buf, PAGE_SIZE, "%pOF\n", dp); + return scnprintf(buf, PAGE_SIZE, "%pOF\n", dp); } static DEVICE_ATTR(obppath, S_IRUSR | S_IRGRP | S_IROTH, |