Message ID | 20180920172301.21868-15-miguel.ojeda.sandonis@gmail.com (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
Series | Compiler Attributes | expand |
On Thu, Sep 20, 2018 at 10:23 AM Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> wrote: > > Let gcc know these arrays are not meant to be NUL-terminated > by annotating them with the new __nonstring variable attribute; > and remove the comment since it conveys the same information. > > Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> > --- > drivers/auxdisplay/panel.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/auxdisplay/panel.c b/drivers/auxdisplay/panel.c > index 3b25a643058c..21b9b2f2470a 100644 > --- a/drivers/auxdisplay/panel.c > +++ b/drivers/auxdisplay/panel.c > @@ -155,10 +155,9 @@ struct logical_input { > int release_data; > } std; > struct { /* valid when type == INPUT_TYPE_KBD */ > - /* strings can be non null-terminated */ > - char press_str[sizeof(void *) + sizeof(int)]; > - char repeat_str[sizeof(void *) + sizeof(int)]; > - char release_str[sizeof(void *) + sizeof(int)]; > + char press_str[sizeof(void *) + sizeof(int)] __nonstring; > + char repeat_str[sizeof(void *) + sizeof(int)] __nonstring; > + char release_str[sizeof(void *) + sizeof(int)] __nonstring; > } kbd; > } u; > }; > -- > 2.17.1 > Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
diff --git a/drivers/auxdisplay/panel.c b/drivers/auxdisplay/panel.c index 3b25a643058c..21b9b2f2470a 100644 --- a/drivers/auxdisplay/panel.c +++ b/drivers/auxdisplay/panel.c @@ -155,10 +155,9 @@ struct logical_input { int release_data; } std; struct { /* valid when type == INPUT_TYPE_KBD */ - /* strings can be non null-terminated */ - char press_str[sizeof(void *) + sizeof(int)]; - char repeat_str[sizeof(void *) + sizeof(int)]; - char release_str[sizeof(void *) + sizeof(int)]; + char press_str[sizeof(void *) + sizeof(int)] __nonstring; + char repeat_str[sizeof(void *) + sizeof(int)] __nonstring; + char release_str[sizeof(void *) + sizeof(int)] __nonstring; } kbd; } u; };
Let gcc know these arrays are not meant to be NUL-terminated by annotating them with the new __nonstring variable attribute; and remove the comment since it conveys the same information. Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> --- drivers/auxdisplay/panel.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)