| Message ID | 1351022246-8201-17-git-send-email-elezegarcia@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 2012-10-23 at 16:57 -0300, Ezequiel Garcia wrote: > This kind of memcpy() is error-prone. Its replacement with a struct > assignment is prefered because it's type-safe and much easier to read. > > Found by coccinelle. Hand patched and reviewed. > Tested by compilation only. > > A simplified version of the semantic match that finds this problem is as > follows: (http://coccinelle.lip6.fr/) > > // <smpl> > @@ > identifier struct_name; > struct struct_name to; > struct struct_name from; > expression E; > @@ > -memcpy(&(to), &(from), E); > +to = from; > // </smpl> > > Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com> > Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com> This patch looks OK to me. You forgot to CC: Steven Toth and/or Devin Heitmueller (I can't remember who did the VBI work.) For cx23885-video.c: Reviewed-by: Andy Walls <awalls@md.metrocast.net> For cx23885-ir.c: Signed-off-by: Andy Walls <awalls@md.metrocast.net> > --- > drivers/media/pci/cx23885/cx23885-video.c | 3 +-- > drivers/media/pci/cx23885/cx23888-ir.c | 6 ++---- > 2 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c > index 1a21926..62be144 100644 > --- a/drivers/media/pci/cx23885/cx23885-video.c > +++ b/drivers/media/pci/cx23885/cx23885-video.c > @@ -1818,8 +1818,7 @@ int cx23885_video_register(struct cx23885_dev *dev) > spin_lock_init(&dev->slock); > > /* Initialize VBI template */ > - memcpy(&cx23885_vbi_template, &cx23885_video_template, > - sizeof(cx23885_vbi_template)); > + cx23885_vbi_template = cx23885_video_template; > strcpy(cx23885_vbi_template.name, "cx23885-vbi"); > > dev->tvnorm = cx23885_video_template.current_norm; > diff --git a/drivers/media/pci/cx23885/cx23888-ir.c b/drivers/media/pci/cx23885/cx23888-ir.c > index c2bc39c..e448146 100644 > --- a/drivers/media/pci/cx23885/cx23888-ir.c > +++ b/drivers/media/pci/cx23885/cx23888-ir.c > @@ -1236,13 +1236,11 @@ int cx23888_ir_probe(struct cx23885_dev *dev) > cx23888_ir_write4(dev, CX23888_IR_IRQEN_REG, 0); > > mutex_init(&state->rx_params_lock); > - memcpy(&default_params, &default_rx_params, > - sizeof(struct v4l2_subdev_ir_parameters)); > + default_params = default_rx_params; > v4l2_subdev_call(sd, ir, rx_s_parameters, &default_params); > > mutex_init(&state->tx_params_lock); > - memcpy(&default_params, &default_tx_params, > - sizeof(struct v4l2_subdev_ir_parameters)); > + default_params = default_tx_params; > v4l2_subdev_call(sd, ir, tx_s_parameters, &default_params); > } else { > kfifo_free(&state->rx_kfifo); -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
(CCed Steven Toth and Devin Heitmueller) On Tue, Oct 23, 2012 at 7:16 PM, Andy Walls <awalls@md.metrocast.net> wrote: > On Tue, 2012-10-23 at 16:57 -0300, Ezequiel Garcia wrote: >> This kind of memcpy() is error-prone. Its replacement with a struct >> assignment is prefered because it's type-safe and much easier to read. >> >> Found by coccinelle. Hand patched and reviewed. >> Tested by compilation only. >> >> A simplified version of the semantic match that finds this problem is as >> follows: (http://coccinelle.lip6.fr/) >> >> // <smpl> >> @@ >> identifier struct_name; >> struct struct_name to; >> struct struct_name from; >> expression E; >> @@ >> -memcpy(&(to), &(from), E); >> +to = from; >> // </smpl> >> >> Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com> >> Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com> > > This patch looks OK to me. You forgot to CC: Steven Toth and/or Devin > Heitmueller (I can't remember who did the VBI work.) Done, thank you. Ezequiel -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c index 1a21926..62be144 100644 --- a/drivers/media/pci/cx23885/cx23885-video.c +++ b/drivers/media/pci/cx23885/cx23885-video.c @@ -1818,8 +1818,7 @@ int cx23885_video_register(struct cx23885_dev *dev) spin_lock_init(&dev->slock); /* Initialize VBI template */ - memcpy(&cx23885_vbi_template, &cx23885_video_template, - sizeof(cx23885_vbi_template)); + cx23885_vbi_template = cx23885_video_template; strcpy(cx23885_vbi_template.name, "cx23885-vbi"); dev->tvnorm = cx23885_video_template.current_norm; diff --git a/drivers/media/pci/cx23885/cx23888-ir.c b/drivers/media/pci/cx23885/cx23888-ir.c index c2bc39c..e448146 100644 --- a/drivers/media/pci/cx23885/cx23888-ir.c +++ b/drivers/media/pci/cx23885/cx23888-ir.c @@ -1236,13 +1236,11 @@ int cx23888_ir_probe(struct cx23885_dev *dev) cx23888_ir_write4(dev, CX23888_IR_IRQEN_REG, 0); mutex_init(&state->rx_params_lock); - memcpy(&default_params, &default_rx_params, - sizeof(struct v4l2_subdev_ir_parameters)); + default_params = default_rx_params; v4l2_subdev_call(sd, ir, rx_s_parameters, &default_params); mutex_init(&state->tx_params_lock); - memcpy(&default_params, &default_tx_params, - sizeof(struct v4l2_subdev_ir_parameters)); + default_params = default_tx_params; v4l2_subdev_call(sd, ir, tx_s_parameters, &default_params); } else { kfifo_free(&state->rx_kfifo);