Messages in this thread Patch in this message | | | From | Arnd Bergmann <> | Subject | Re: [PATCH] wext: handle NULL exta data in iwe_stream_add_point better | Date | Wed, 11 Jan 2017 21:39:07 +0100 |
| |
On Wednesday, January 11, 2017 4:06:17 PM CET Johannes Berg wrote: > > Applied. Also fixed the typo in the subject :)
Thanks! Unfortunately I now got another warning for the same function, and though I would have expected the patch to fix it, that did not work:
In file included from /git/arm-soc/drivers/net/wireless/intersil/prism54/islpci_dev.h:27:0, from /git/arm-soc/drivers/net/wireless/intersil/prism54/isl_ioctl.h:24, from /git/arm-soc/drivers/net/wireless/intersil/prism54/isl_ioctl.c:32: /git/arm-soc/drivers/net/wireless/intersil/prism54/isl_ioctl.c: In function 'prism54_get_scan': /git/arm-soc/include/net/iw_handler.h:560:4: error: argument 2 null where non-null expected [-Werror=nonnull] memcpy(stream + point_len, extra, iwe->u.data.length);
The change below kills that warning too, but it gets even uglier there:
diff --git a/include/net/iw_handler.h b/include/net/iw_handler.h index 1a41043688bc..c2aa73e5e6bb 100644 --- a/include/net/iw_handler.h +++ b/include/net/iw_handler.h @@ -556,7 +556,7 @@ iwe_stream_add_point(struct iw_request_info *info, char *stream, char *ends, memcpy(stream + lcp_len, ((char *) &iwe->u) + IW_EV_POINT_OFF, IW_EV_POINT_PK_LEN - IW_EV_LCP_PK_LEN); - if (iwe->u.data.length) + if (iwe->u.data.length && extra) memcpy(stream + point_len, extra, iwe->u.data.length); stream += event_len; } Let me know if you want a proper follow-up patch, or if you can amend your commit, or you have a better idea for resolving that warning.
Arnd
| |