| Message ID | 75a04abe-59d5-4835-a306-a63e5ff9d35f@xs4all.nl (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [PATCHv3] media: cec: extron-da-hd-4k-plus: Fix Wformat-truncation | expand |
Hi Hans On Tue, 1 Apr 2025 at 14:47, Hans Verkuil <hverkuil@xs4all.nl> wrote: > > Change the port type to u8 so gcc8 knows that the port fits in a single > char. You want to change this commit message > > drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c:1014:44: warning: 'DCEC' directive output may be truncated writing 4 bytes into a region of size between 0 and 53 [-Wformat-truncation=] > > Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> > Reported-by: Ricardo Ribalda <ribalda@chromium.org> Reviewed-by: Ricardo Ribalda <ribalda@chromium.org> > --- > Change since v2: > > Redid the patch, fixing the buffer sizes. It turned out that was the problem. > It now passes build-ancient (I checked the logs this time). > --- > .../cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c b/drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c > index cfbfc4c1b2e6..5ebd9d73fb15 100644 > --- a/drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c > +++ b/drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c > @@ -1002,8 +1002,8 @@ static int extron_cec_adap_transmit(struct cec_adapter *adap, u8 attempts, > u32 signal_free_time, struct cec_msg *msg) > { > struct extron_port *port = cec_get_drvdata(adap); > - char buf[CEC_MAX_MSG_SIZE * 3 + 1]; > - char cmd[CEC_MAX_MSG_SIZE * 3 + 13]; > + char buf[(CEC_MAX_MSG_SIZE - 1) * 3 + 1]; > + char cmd[(CEC_MAX_MSG_SIZE - 1) * 3 + 15]; Random idea, please ignore if you do not like it. What about ?: char cmd[sizeof(buf) + 14]; > unsigned int i; > > if (port->disconnected) > @@ -1013,7 +1013,8 @@ static int extron_cec_adap_transmit(struct cec_adapter *adap, u8 attempts, > sprintf(buf + i * 3, "%%%02X", msg->msg[i + 1]); > snprintf(cmd, sizeof(cmd), "W%c%u*%u*%u*%sDCEC", > port->direction, port->port.port, > - cec_msg_initiator(msg), cec_msg_destination(msg), buf); > + cec_msg_initiator(msg), > + cec_msg_destination(msg), buf); You do not need to change the style here. > return extron_send_and_wait(port->extron, port, cmd, NULL); > } > > -- > 2.47.2 >
diff --git a/drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c b/drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c index cfbfc4c1b2e6..5ebd9d73fb15 100644 --- a/drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c +++ b/drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c @@ -1002,8 +1002,8 @@ static int extron_cec_adap_transmit(struct cec_adapter *adap, u8 attempts, u32 signal_free_time, struct cec_msg *msg) { struct extron_port *port = cec_get_drvdata(adap); - char buf[CEC_MAX_MSG_SIZE * 3 + 1]; - char cmd[CEC_MAX_MSG_SIZE * 3 + 13]; + char buf[(CEC_MAX_MSG_SIZE - 1) * 3 + 1]; + char cmd[(CEC_MAX_MSG_SIZE - 1) * 3 + 15]; unsigned int i; if (port->disconnected) @@ -1013,7 +1013,8 @@ static int extron_cec_adap_transmit(struct cec_adapter *adap, u8 attempts, sprintf(buf + i * 3, "%%%02X", msg->msg[i + 1]); snprintf(cmd, sizeof(cmd), "W%c%u*%u*%u*%sDCEC", port->direction, port->port.port, - cec_msg_initiator(msg), cec_msg_destination(msg), buf); + cec_msg_initiator(msg), + cec_msg_destination(msg), buf); return extron_send_and_wait(port->extron, port, cmd, NULL); }
Change the port type to u8 so gcc8 knows that the port fits in a single char. drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c:1014:44: warning: 'DCEC' directive output may be truncated writing 4 bytes into a region of size between 0 and 53 [-Wformat-truncation=] Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Reported-by: Ricardo Ribalda <ribalda@chromium.org> --- Change since v2: Redid the patch, fixing the buffer sizes. It turned out that was the problem. It now passes build-ancient (I checked the logs this time). --- .../cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)