Zoran strncpy() cleanup
PATCH 1/1 Zoran strncpy() cleanup
hi,
this was spotted by coverity ( bug id #536 ). While
it is not really a bug, i think we should clean it up.std->name can only hold 24 chars, not 32 as the strncpy() calls
suggest. std->name can hold 32 chars, but since we use constant
fixed-sized strings, which will always fit into these arrays, i changed
the strncpy() calls to strcpy(). If you prefer strncpy(foo->name, "bar", sizeof(foo->name)) please let me know and i redo the patch.
drivers/media/video/zoran_driver.c renamed from drivers/media/video/zoran_driver.c.orig +9 -9
@@ -3566,16 +3566,16 @@ zoran_do_ioctl (struct inode *inode,switch (ctrl->id) {case V4L2_CID_BRIGHTNESS : -strncpy (ctrl->name,"Brightness" ,31 ); +strcpy (ctrl->name,"Brightness" );break ;case V4L2_CID_CONTRAST : -strncpy (ctrl->name,"Contrast" ,31 ); +strcpy (ctrl->name,"Contrast" );break ;case V4L2_CID_SATURATION : -strncpy (ctrl->name,"Saturation" ,31 ); +strcpy (ctrl->name,"Saturation" );break ;case V4L2_CID_HUE : -strncpy (ctrl->name,"Hue" ,31 ); +strcpy (ctrl->name,"Hue" );break ; }
@@ -3693,7 +3693,7 @@ zoran_do_ioctl (struct inode *inode, &caps);if (caps.flags &VIDEO_DECODER_AUTO ) { std->id =V4L2_STD_ALL ; -strncpy (std->name,"Autodetect" ,31 ); +strcpy (std->name,"Autodetect" );return 0 ; }else return -EINVAL ;
@@ -3701,21 +3701,21 @@ zoran_do_ioctl (struct inode *inode,switch (std->index) {case 0 : std->id =V4L2_STD_PAL ; -strncpy (std->name,"PAL" ,31 ); +strcpy (std->name,"PAL" ); std->frameperiod.numerator =1 ; std->frameperiod.denominator =25 ; std->framelines = zr->card.tvn[0 ]->Ht;break ;case 1 : std->id =V4L2_STD_NTSC ; -strncpy (std->name,"NTSC" ,31 ); +strcpy (std->name,"NTSC" ); std->frameperiod.numerator =1001 ; std->frameperiod.denominator =30000 ; std->framelines = zr->card.tvn[1 ]->Ht;break ;case 2 : std->id =V4L2_STD_SECAM ; -strncpy (std->name,"SECAM" ,31 ); +strcpy (std->name,"SECAM" ); std->frameperiod.numerator =1 ; std->frameperiod.denominator =25 ; std->framelines = zr->card.tvn[2 ]->Ht;
@@ -3871,7 +3871,7 @@ zoran_do_ioctl (struct inode *inode,memset (outp,0 ,sizeof (*outp)); outp->index =0 ; outp->type =V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY ; -strncpy (outp->name,"Autodetect" ,31 ); +strcpy (outp->name,"Autodetect" );return 0 ; }
Quoted 11 lines · Eric Sesterhenn
hi,
this was spotted by coverity ( bug id #536 ). While
it is not really a bug, i think we should clean it up.std->namecan only hold 24 chars, not 32 as thestrncpy()calls
suggest.std->namecan hold 32 chars, but since we use constant
fixed-sized strings, which will always fit into these arrays, i changed
thestrncpy()calls tostrcpy(). If you preferstrncpy(foo->name, "bar", sizeof(foo->name))please let me know and i redo the patch.Signed-off-by Eric Sesterhenn <[email protected]>
This _is_ really a bug. strncpy() pads the remaining bytes of dest with zeroes, which destroys parts of the v4l2_standard structure (in particular, the v4l2_fract substructure). I'd suggest not to use strcpy() although it's safe here -- until someone changes the structure sizes.
Kind regards,
Horst
Signature · 1 line
PGP-Key 0xD40E0E7A
Quoted 11 lines · Horst Schirmeier
Quoted 10 lines · Eric Sesterhenn
hi,
this was spotted by coverity ( bug id #536 ). While
it is not really a bug, i think we should clean it up.std->namecan only hold 24 chars, not 32 as thestrncpy()calls
suggest.std->namecan hold 32 chars, but since we use constant
fixed-sized strings, which will always fit into these arrays, i changed
thestrncpy()calls tostrcpy(). If you preferstrncpy(foo->name, "bar", sizeof(foo->name))please let me know and i redo the patch.
Quoted 7 lines
Quoted 1 line
Signed-off-by Eric Sesterhenn <[email protected]>This _is_ really a bug.
strncpy()pads the remaining bytes of dest with zeroes, which destroys parts of thev4l2_standardstructure (in particular, thev4l2_fractsubstructure). I'd suggest not to usestrcpy()although it's safe here -- until someone changes the structure sizes.
Thanks for the fast reply, here is an updated version. This patch changes all strncpy() calls to use sizeof(foo)-1 as the last parameter.
drivers/media/video/zoran_driver.c renamed from drivers/media/video/zoran_driver.c.orig +13 -13
@@ -2047,7 +2047,7 @@ zoran_do_ioctl (struct inode *inode,dprintk (3 ,KERN_DEBUG "%s: VIDIOCGCAP\n" ,ZR_DEVNAME (zr));memset (vcap,0 ,sizeof (struct video_capability )); -strncpy (vcap->name,ZR_DEVNAME (zr),sizeof (vcap->name)); +strncpy (vcap->name,ZR_DEVNAME (zr),sizeof (vcap->name)-1 ); vcap->type =ZORAN_VID_TYPE ; vcap->channels = zr->card.inputs;
@@ -2689,8 +2689,8 @@ zoran_do_ioctl (struct inode *inode,dprintk (3 ,KERN_DEBUG "%s: VIDIOC_QUERYCAP\n" ,ZR_DEVNAME (zr));memset (cap,0 ,sizeof (*cap)); -strncpy (cap->card,ZR_DEVNAME (zr),sizeof (cap->card)); -strncpy (cap->driver,"zoran" ,sizeof (cap->driver)); +strncpy (cap->card,ZR_DEVNAME (zr),sizeof (cap->card)-1 ); +strncpy (cap->driver,"zoran" ,sizeof (cap->driver)-1 );snprintf (cap->bus_info,sizeof (cap->bus_info),"PCI:%s" ,pci_name (zr->pci_dev)); cap->version =
@@ -2742,7 +2742,7 @@ zoran_do_ioctl (struct inode *inode,memset (fmt,0 ,sizeof (*fmt)); fmt->index = index; fmt->type = type; -strncpy (fmt->description, zoran_formats[i].name,31 ); +strncpy (fmt->description, zoran_formats[i].name,sizeof (fmt->description)-1 ); fmt->pixelformat = zoran_formats[i].fourcc;if (zoran_formats[i].flags &ZORAN_FORMAT_COMPRESSED ) fmt->flags |=V4L2_FMT_FLAG_COMPRESSED ;
@@ -3566,16 +3566,16 @@ zoran_do_ioctl (struct inode *inode,switch (ctrl->id) {case V4L2_CID_BRIGHTNESS : -strncpy (ctrl->name,"Brightness" ,31 ); +strncpy (ctrl->name,"Brightness" ,sizeof (ctrl->name)-1 );break ;case V4L2_CID_CONTRAST : -strncpy (ctrl->name,"Contrast" ,31 ); +strncpy (ctrl->name,"Contrast" ,sizeof (ctrl->name)-1 );break ;case V4L2_CID_SATURATION : -strncpy (ctrl->name,"Saturation" ,31 ); +strncpy (ctrl->name,"Saturation" ,sizeof (ctrl->name)-1 );break ;case V4L2_CID_HUE : -strncpy (ctrl->name,"Hue" ,31 ); +strncpy (ctrl->name,"Hue" ,sizeof (ctrl->name)-1 );break ; }
@@ -3693,7 +3693,7 @@ zoran_do_ioctl (struct inode *inode, &caps);if (caps.flags &VIDEO_DECODER_AUTO ) { std->id =V4L2_STD_ALL ; -strncpy (std->name,"Autodetect" ,31 ); +strncpy (std->name,"Autodetect" ,sizeof (std->name)-1 );return 0 ; }else return -EINVAL ;
@@ -3701,21 +3701,21 @@ zoran_do_ioctl (struct inode *inode,switch (std->index) {case 0 : std->id =V4L2_STD_PAL ; -strncpy (std->name,"PAL" ,31 ); +strncpy (std->name,"PAL" ,sizeof (std->name)-1 ); std->frameperiod.numerator =1 ; std->frameperiod.denominator =25 ; std->framelines = zr->card.tvn[0 ]->Ht;break ;case 1 : std->id =V4L2_STD_NTSC ; -strncpy (std->name,"NTSC" ,31 ); +strncpy (std->name,"NTSC" ,sizeof (std->name)-1 ); std->frameperiod.numerator =1001 ; std->frameperiod.denominator =30000 ; std->framelines = zr->card.tvn[1 ]->Ht;break ;case 2 : std->id =V4L2_STD_SECAM ; -strncpy (std->name,"SECAM" ,31 ); +strncpy (std->name,"SECAM" ,sizeof (std->name)-1 ); std->frameperiod.numerator =1 ; std->frameperiod.denominator =25 ; std->framelines = zr->card.tvn[2 ]->Ht;
@@ -3871,7 +3871,7 @@ zoran_do_ioctl (struct inode *inode,memset (outp,0 ,sizeof (*outp)); outp->index =0 ; outp->type =V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY ; -strncpy (outp->name,"Autodetect" ,31 ); +strncpy (outp->name,"Autodetect" ,sizeof (outp->name)-1 );return 0 ; }
Quoted 20 lines · Eric Sesterhenn
Quoted 11 lines · Horst Schirmeier
Quoted 10 lines · Eric Sesterhenn
hi,
this was spotted by coverity ( bug id #536 ). While
it is not really a bug, i think we should clean it up.std->namecan only hold 24 chars, not 32 as thestrncpy()calls
suggest.std->namecan hold 32 chars, but since we use constant
fixed-sized strings, which will always fit into these arrays, i changed
thestrncpy()calls tostrcpy(). If you preferstrncpy(foo->name, "bar", sizeof(foo->name))please let me know and i redo the patch.Quoted 7 lines
Quoted 1 line
Signed-off-by Eric Sesterhenn <[email protected]>This _is_ really a bug.
strncpy()pads the remaining bytes of dest with zeroes, which destroys parts of thev4l2_standardstructure (in particular, thev4l2_fractsubstructure). I'd suggest not to usestrcpy()although it's safe here -- until someone changes the structure sizes.
Quoted 3 lines
Thanks for the fast reply, here is an updated version. This patch changes all
strncpy()calls to use sizeof(foo)-1 as the last parameter.
Problem is, the strings are (possibly) still not zero-terminated:strncpy() only appends zeroes if src contents are short enough; if they are not, dest is only zero-terminated if dest[sizeof(dest)-1] was zero before.strlcpy() semantics promise more sanity; dest is always zero-terminated (if its size is >= 1), and the size parameter holds total dest size. (See lib/string.c for more details.)
Kind regards,
Horst
Signature · 1 line
PGP-Key 0xD40E0E7A
Quoted 7 lines
Problem is, the strings are (possibly) still not zero-terminated:
strncpy()only appends zeroes if src contents are short enough; if they are not, dest is only zero-terminated if dest[sizeof(dest)-1] was zero before.strlcpy()semantics promise more sanity; dest is always zero-terminated (if its size is >= 1), and the size parameter holds total dest size. (Seelib/string.cfor more details.)
In all cases there is a memset() which sets the entire structure to zero. Since we never write to the last byte with the strncpy() it will be null terminated. But if you think strlcpy() is safer for the future, i can make you a third patch.
Greetings, Eric
Quoted 8 lines · Eric Sesterhenn
Quoted 7 lines
Problem is, the strings are (possibly) still not zero-terminated:
strncpy()only appends zeroes if src contents are short enough; if they are not, dest is only zero-terminated if dest[sizeof(dest)-1] was zero before.strlcpy()semantics promise more sanity; dest is always zero-terminated (if its size is >= 1), and the size parameter holds total dest size. (Seelib/string.cfor more details.)
Quoted 4 lines
In all cases there is a
memset()which sets the entire structure to zero. Since we never write to the last byte with thestrncpy()it will be null terminated. But if you thinkstrlcpy()is safer for the future, i can make you a third patch.
I did not dig in the surrounding code that deeply, no doubt you're right about the zero termination issue.
I just _personally_ think strlcpy(dest, src, sizeof(*dest)); looks more sane than strncpy(dest, src, sizeof(*dest)-1);, and it additionally does not rely on dest being zero-terminated beforehand.
Kind regards,
Horst
Signature · 1 line
PGP-Key 0xD40E0E7A