| Message ID | 20131216201950.GA19601@elgon.mountain (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Dan, Thank you for the patch. On Monday 16 December 2013 23:19:50 Dan Carpenter wrote: > Smatch complains here because name is a 32 character buffer and we > adding the "OMAP4 ISS " prefix as well for a total of 42 characters. > The sd->name buffer can only hold 32 characters. I've changed it to use > snprintf() to silence the overflow warning. > > Also I have removed the call to strlcpy() which is a no-op. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> and applied to my tree. > diff --git a/drivers/staging/media/omap4iss/iss_csi2.c > b/drivers/staging/media/omap4iss/iss_csi2.c index > 0ee8381c738d..7ab05126be5d 100644 > --- a/drivers/staging/media/omap4iss/iss_csi2.c > +++ b/drivers/staging/media/omap4iss/iss_csi2.c > @@ -1273,8 +1273,7 @@ static int csi2_init_entities(struct iss_csi2_device > *csi2, const char *subname) v4l2_subdev_init(sd, &csi2_ops); > sd->internal_ops = &csi2_internal_ops; > sprintf(name, "CSI2%s", subname); > - strlcpy(sd->name, "", sizeof(sd->name)); > - sprintf(sd->name, "OMAP4 ISS %s", name); > + snprintf(sd->name, sizeof(sd->name), "OMAP4 ISS %s", name); > > sd->grp_id = 1 << 16; /* group ID for iss subdevs */ > v4l2_set_subdevdata(sd, csi2);
diff --git a/drivers/staging/media/omap4iss/iss_csi2.c b/drivers/staging/media/omap4iss/iss_csi2.c index 0ee8381c738d..7ab05126be5d 100644 --- a/drivers/staging/media/omap4iss/iss_csi2.c +++ b/drivers/staging/media/omap4iss/iss_csi2.c @@ -1273,8 +1273,7 @@ static int csi2_init_entities(struct iss_csi2_device *csi2, const char *subname) v4l2_subdev_init(sd, &csi2_ops); sd->internal_ops = &csi2_internal_ops; sprintf(name, "CSI2%s", subname); - strlcpy(sd->name, "", sizeof(sd->name)); - sprintf(sd->name, "OMAP4 ISS %s", name); + snprintf(sd->name, sizeof(sd->name), "OMAP4 ISS %s", name); sd->grp_id = 1 << 16; /* group ID for iss subdevs */ v4l2_set_subdevdata(sd, csi2);
Smatch complains here because name is a 32 character buffer and we adding the "OMAP4 ISS " prefix as well for a total of 42 characters. The sd->name buffer can only hold 32 characters. I've changed it to use snprintf() to silence the overflow warning. Also I have removed the call to strlcpy() which is a no-op. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> -- 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