Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1556526
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH] wext: handle NULL exta data in iwe_stream_add_point better |
| Date | 2017-01-11 15:40 +0100 |
| Message-ID | <sYsed-82P-1@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
gcc-7 complains that wl3501_cs passes NULL into a function that then uses the argument as the input for memcpy: drivers/net/wireless/wl3501_cs.c: In function 'wl3501_get_scan': include/net/iw_handler.h:559:3: error: argument 2 null where non-null expected [-Werror=nonnull] memcpy(stream + point_len, extra, iwe->u.data.length); This works fine here because iwe->u.data.length is guaranteed to be NULL, and the memcpy doesn't actually have an effect. Making the length check explicit avoids the warning and should have no other effect here. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- include/net/iw_handler.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/net/iw_handler.h b/include/net/iw_handler.h index e0f4109e64c6..1a41043688bc 100644 --- a/include/net/iw_handler.h +++ b/include/net/iw_handler.h @@ -556,7 +556,8 @@ 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); - memcpy(stream + point_len, extra, iwe->u.data.length); + if (iwe->u.data.length) + memcpy(stream + point_len, extra, iwe->u.data.length); stream += event_len; } return stream; -- 2.9.0
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
[PATCH] wext: handle NULL exta data in iwe_stream_add_point better Arnd Bergmann <arnd@arndb.de> - 2017-01-11 15:40 +0100
Re: [PATCH] wext: handle NULL exta data in iwe_stream_add_point better Johannes Berg <johannes@sipsolutions.net> - 2017-01-11 15:40 +0100
Re: [PATCH] wext: handle NULL exta data in iwe_stream_add_point better Arnd Bergmann <arnd@arndb.de> - 2017-01-11 16:10 +0100
Re: [PATCH] wext: handle NULL exta data in iwe_stream_add_point better Johannes Berg <johannes@sipsolutions.net> - 2017-01-11 16:10 +0100
Re: [PATCH] wext: handle NULL exta data in iwe_stream_add_point better Arnd Bergmann <arnd@arndb.de> - 2017-01-11 21:50 +0100
Re: [PATCH] wext: handle NULL exta data in iwe_stream_add_point better Johannes Berg <johannes@sipsolutions.net> - 2017-01-12 09:40 +0100
Re: [PATCH] wext: handle NULL exta data in iwe_stream_add_point better Johannes Berg <johannes@sipsolutions.net> - 2017-01-12 10:20 +0100
Re: [PATCH] wext: handle NULL exta data in iwe_stream_add_point better Johannes Berg <johannes@sipsolutions.net> - 2017-01-12 10:20 +0100
Re: [PATCH] wext: handle NULL exta data in iwe_stream_add_point better Arnd Bergmann <arnd@arndb.de> - 2017-01-12 10:50 +0100
csiph-web