| Message ID | 20250310222432.work.826-kees@kernel.org (mailing list archive) |
|---|---|
| State | In Next |
| Delegated to: | Rafael Wysocki |
| Headers | show |
| Series | PNP: Expand length of fixup id string | expand |
On Mon, Mar 10, 2025 at 11:24 PM Kees Cook <kees@kernel.org> wrote: > > GCC 15's -Wunterminated-string-initialization saw that "id" was not > including the required trailing NUL character. Instead of marking "id" > with __nonstring[1], expand the length of the string as it is used in > (debugging) format strings that expect a properly formed C string. > > Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117178 [1] > Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> > Cc: linux-acpi@vger.kernel.org > Signed-off-by: Kees Cook <kees@kernel.org> > --- > include/linux/pnp.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/linux/pnp.h b/include/linux/pnp.h > index b7a7158aaf65..23fe3eaf242d 100644 > --- a/include/linux/pnp.h > +++ b/include/linux/pnp.h > @@ -290,7 +290,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data) > } > > struct pnp_fixup { > - char id[7]; > + char id[8]; > void (*quirk_function) (struct pnp_dev *dev); /* fixup function */ > }; > > -- Applied as 6.15 material, thanks!
diff --git a/include/linux/pnp.h b/include/linux/pnp.h index b7a7158aaf65..23fe3eaf242d 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h @@ -290,7 +290,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data) } struct pnp_fixup { - char id[7]; + char id[8]; void (*quirk_function) (struct pnp_dev *dev); /* fixup function */ };
GCC 15's -Wunterminated-string-initialization saw that "id" was not including the required trailing NUL character. Instead of marking "id" with __nonstring[1], expand the length of the string as it is used in (debugging) format strings that expect a properly formed C string. Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117178 [1] Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> Cc: linux-acpi@vger.kernel.org Signed-off-by: Kees Cook <kees@kernel.org> --- include/linux/pnp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)