drivers/video: Fix -Wstringop-truncation in hdmi.c
PATCH 1/1 drivers/video: Fix -Wstringop-truncation in hdmi.c
Trying to copy into the string fields with strncpy() gives a warning from gcc. Both fields are part of a packed HDMI header and do not require a terminating \0 character.
../drivers/video/hdmi.c: In function 'hdmi_spd_infoframe_init':../drivers/video/hdmi.c:230:2: warning: 'strncpy' specified bound 8 equals destination size [-Wstringop-truncation]
230 | strncpy(frame->vendor, vendor, sizeof(frame->vendor));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/video/hdmi.c:231:2: warning: 'strncpy' specified bound 16 equals destination size [-Wstringop-truncation]
231 | strncpy(frame->product, product, sizeof(frame->product));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Just use memcpy() instead.
--- drivers/video/hdmi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/video/hdmi.c +6 -2
@@ -221,14 +221,18 @@ EXPORT_SYMBOL(hdmi_avi_infoframe_pack);int hdmi_spd_infoframe_init (struct hdmi_spd_infoframe *frame,const char *vendor,const char *product) { +size_t len; +memset (frame,0 ,sizeof (*frame)); frame->type =HDMI_INFOFRAME_TYPE_SPD ; frame->version =1 ; frame->length =HDMI_SPD_INFOFRAME_SIZE ; -strncpy (frame->vendor, vendor,sizeof (frame->vendor)); -strncpy (frame->product, product,sizeof (frame->product)); + len =strlen (vendor); +memcpy (frame->vendor, vendor,min (len,sizeof (frame->vendor))); + len =strlen (product); +memcpy (frame->product, product,min (len,sizeof (frame->product)));return 0 ; }
Signature · 1 line
2.28.0
Hi Thomas,
Thank you for the patch.
Quoted 31 lines · Thomas Zimmermann
Trying to copy into the string fields with
strncpy()gives a warning from gcc. Both fields are part of a packed HDMI header and do not require a terminating \0 character.
../drivers/video/hdmi.c: In function 'hdmi_spd_infoframe_init':../drivers/video/hdmi.c:230:2: warning: 'strncpy' specified bound 8 equals destination size [-Wstringop-truncation]230 | strncpy(frame->vendor, vendor, sizeof(frame->vendor)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../drivers/video/hdmi.c:231:2: warning: 'strncpy' specified bound 16 equals destination size [-Wstringop-truncation] 231 | strncpy(frame->product, product, sizeof(frame->product)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Just use
memcpy()instead.Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/video/hdmi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/video/hdmi.c +2
-0@@ -221,14 +221,18 @@ EXPORT_SYMBOL(hdmi_avi_infoframe_pack);int hdmi_spd_infoframe_init (struct hdmi_spd_infoframe *frame,const char *vendor,const char *product) { +size_t len; +memset (frame,0 ,sizeof (*frame));
drivers/video/hdmi.c EXPORT_SYMBOL(hdmi_avi_infoframe_pack); · line 235
Quoted 10 lines
drivers/video/hdmi.c +4
-2frame->type =HDMI_INFOFRAME_TYPE_SPD ; frame->version =1 ; frame->length =HDMI_SPD_INFOFRAME_SIZE ; -strncpy (frame->vendor, vendor,sizeof (frame->vendor)); -strncpy (frame->product, product,sizeof (frame->product)); + len =strlen (vendor); +memcpy (frame->vendor, vendor,min (len,sizeof (frame->vendor))); + len =strlen (product); +memcpy (frame->product, product,min (len,sizeof (frame->product)));
As this seems to be a legitimate use of strncpy(), isn't there a way to silence the warning without requiring this additional runtime complexity ?
Quoted 3 lines
drivers/video/hdmi.c +0
-0return 0 ; }
Signature · 3 lines
Regards, Laurent Pinchart
Hi
Quoted 40 lines · Laurent Pinchart
Hi Thomas,
Thank you for the patch.
Quoted 35 lines · Thomas Zimmermann
Trying to copy into the string fields with
strncpy()gives a warning from gcc. Both fields are part of a packed HDMI header and do not require a terminating \0 character.
../drivers/video/hdmi.c: In function 'hdmi_spd_infoframe_init':../drivers/video/hdmi.c:230:2: warning: 'strncpy' specified bound 8 equals destination size [-Wstringop-truncation]230 | strncpy(frame->vendor, vendor, sizeof(frame->vendor)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../drivers/video/hdmi.c:231:2: warning: 'strncpy' specified bound 16 equals destination size [-Wstringop-truncation] 231 | strncpy(frame->product, product, sizeof(frame->product)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Just use
memcpy()instead.Signed-off-by Thomas Zimmermann <[email protected]>--- drivers/video/hdmi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/video/hdmi.c +2
-0@@ -221,14 +221,18 @@ EXPORT_SYMBOL(hdmi_avi_infoframe_pack);int hdmi_spd_infoframe_init (struct hdmi_spd_infoframe *frame,const char *vendor,const char *product) { +size_t len; +memset (frame,0 ,sizeof (*frame)); frame->type =HDMI_INFOFRAME_TYPE_SPD ; frame->version =1 ; frame->length =HDMI_SPD_INFOFRAME_SIZE ;
Quoted 10 lines
drivers/video/hdmi.c EXPORT_SYMBOL(hdmi_avi_infoframe_pack); · line 235
Quoted 6 lines
drivers/video/hdmi.c +4
-2-strncpy (frame->vendor, vendor,sizeof (frame->vendor)); -strncpy (frame->product, product,sizeof (frame->product)); + len =strlen (vendor); +memcpy (frame->vendor, vendor,min (len,sizeof (frame->vendor))); + len =strlen (product); +memcpy (frame->product, product,min (len,sizeof (frame->product)));As this seems to be a legitimate use of
strncpy(), isn't there a way to silence the warning without requiring this additional runtime complexity ?
Yes, the original code this correct. I looked through include/string.h if there's better string function, but none fits. Most of them 0-terminate the output string.
The only simple fix seems to be to set gcc's -Wno-stringop-truncation here. I'd expect that would be an even less preferable change.
Best regards
Thomas
Quoted 5 lines
Quoted 4 lines
drivers/video/hdmi.c +0
-0return 0 ; }
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
Quoted 12 lines · Thomas Zimmermann
Trying to copy into the string fields with
strncpy()gives a warning from gcc. Both fields are part of a packed HDMI header and do not require a terminating \0 character.
../drivers/video/hdmi.c: In function 'hdmi_spd_infoframe_init':../drivers/video/hdmi.c:230:2: warning: 'strncpy' specified bound 8 equals destination size [-Wstringop-truncation]230 | strncpy(frame->vendor, vendor, sizeof(frame->vendor)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../drivers/video/hdmi.c:231:2: warning: 'strncpy' specified bound 16 equals destination size [-Wstringop-truncation] 231 | strncpy(frame->product, product, sizeof(frame->product)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Quoted 3 lines
Just use
memcpy()instead.Signed-off-by Thomas Zimmermann <[email protected]>
I assume vendor is guaranteed to be 0-termindated.
Quoted 36 lines
--- drivers/video/hdmi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/video/hdmi.c +6
-2@@ -221,14 +221,18 @@ EXPORT_SYMBOL(hdmi_avi_infoframe_pack);int hdmi_spd_infoframe_init (struct hdmi_spd_infoframe *frame,const char *vendor,const char *product) { +size_t len; +memset (frame,0 ,sizeof (*frame)); frame->type =HDMI_INFOFRAME_TYPE_SPD ; frame->version =1 ; frame->length =HDMI_SPD_INFOFRAME_SIZE ; -strncpy (frame->vendor, vendor,sizeof (frame->vendor)); -strncpy (frame->product, product,sizeof (frame->product)); + len =strlen (vendor); +memcpy (frame->vendor, vendor,min (len,sizeof (frame->vendor))); + len =strlen (product); +memcpy (frame->product, product,min (len,sizeof (frame->product)));return 0 ; }Signature · 6 lines
2.28.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi
Am 01.11.20 um 10:50 schrieb Sam Ravnborg:
Quoted 13 lines · Thomas Zimmermann
Quoted 12 lines
Trying to copy into the string fields with
strncpy()gives a warning from gcc. Both fields are part of a packed HDMI header and do not require a terminating \0 character.
../drivers/video/hdmi.c: In function 'hdmi_spd_infoframe_init':../drivers/video/hdmi.c:230:2: warning: 'strncpy' specified bound 8 equals destination size [-Wstringop-truncation]230 | strncpy(frame->vendor, vendor, sizeof(frame->vendor)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../drivers/video/hdmi.c:231:2: warning: 'strncpy' specified bound 16 equals destination size [-Wstringop-truncation] 231 | strncpy(frame->product, product, sizeof(frame->product)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Quoted 4 lines
Quoted 3 lines
Just use
memcpy()instead.Signed-off-by Thomas Zimmermann <[email protected]>I assume vendor is guaranteed to be 0-termindated.
It's a fixed-length field in the protocol. There's similar code in radeon IIRC. So it would be nice to disable the warning in these cases. But that's probably to much fiddling.
Quoted 1 line
Reviewed-by Sam Ravnborg <[email protected]>
Thanks.
Best regards
Thomas
Quoted 37 lines
Quoted 37 lines
--- drivers/video/hdmi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/video/hdmi.c +6
-2@@ -221,14 +221,18 @@ EXPORT_SYMBOL(hdmi_avi_infoframe_pack);int hdmi_spd_infoframe_init (struct hdmi_spd_infoframe *frame,const char *vendor,const char *product) { +size_t len; +memset (frame,0 ,sizeof (*frame)); frame->type =HDMI_INFOFRAME_TYPE_SPD ; frame->version =1 ; frame->length =HDMI_SPD_INFOFRAME_SIZE ; -strncpy (frame->vendor, vendor,sizeof (frame->vendor)); -strncpy (frame->product, product,sizeof (frame->product)); + len =strlen (vendor); +memcpy (frame->vendor, vendor,min (len,sizeof (frame->vendor))); + len =strlen (product); +memcpy (frame->product, product,min (len,sizeof (frame->product)));return 0 ; }Signature · 6 lines
2.28.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer