[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20250830173850.323897-3-nogunix@gmail.com>
Date: Sun, 31 Aug 2025 02:38:50 +0900
From: Masaharu Noguchi <nogunix@...il.com>
To: gregkh@...uxfoundation.org,
linux-staging@...ts.linux.dev
Cc: vaibhav.sr@...il.com,
mgreer@...malcreek.com,
johan@...nel.org,
elder@...nel.org,
greybus-dev@...ts.linaro.org,
florian.fainelli@...adcom.com,
rjui@...adcom.com,
sbranden@...adcom.com,
bcm-kernel-feedback-list@...adcom.com,
dave.stevenson@...pberrypi.com,
laurent.pinchart@...asonboard.com,
hverkuil@...nel.org,
linux-rpi-kernel@...ts.infradead.org,
linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org,
Masaharu Noguchi <nogunix@...il.com>
Subject: [PATCH 2/2] staging: vc04_services: bcm2835-camera: avoid -Wformat-truncation
- Fix -Wformat-truncation in vidioc_querycap() when composing bus_info.
- Use scnprintf() for the prefix and strscpy() for the remainder.
Signed-off-by: Masaharu Noguchi <nogunix@...il.com>
---
.../staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
index fa7ea4ca4c36..c2788659af12 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
@@ -874,13 +874,14 @@ static int vidioc_querycap(struct file *file, void *priv,
struct bcm2835_mmal_dev *dev = video_drvdata(file);
u32 major;
u32 minor;
+ int n;
vchiq_mmal_version(dev->instance, &major, &minor);
strscpy(cap->driver, "bcm2835 mmal", sizeof(cap->driver));
snprintf((char *)cap->card, sizeof(cap->card), "mmal service %d.%d", major, minor);
-
- snprintf((char *)cap->bus_info, sizeof(cap->bus_info), "platform:%s", dev->v4l2_dev.name);
+ n = scnprintf((char *)cap->bus_info, sizeof(cap->bus_info), "platform:");
+ strscpy((char *)cap->bus_info + n, dev->v4l2_dev.name, sizeof(cap->bus_info) - n);
return 0;
}
--
2.39.5
Powered by blists - more mailing lists