| Message ID | 20170915195526.1541309-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 6ce14f6416c84bd9c81777edf899b57ac5000c87 |
| Headers | show |
| Series | acpi: watchdog: properly initialize resources | expand |
On Fri, Sep 15, 2017 at 09:55:18PM +0200, Arnd Bergmann wrote: > We copy a local resource structure into a list, but only > initialize some of its members, as pointed out by gcc-4.4: > > drivers/acpi/acpi_watchdog.c: In function 'acpi_watchdog_init': > drivers/acpi/acpi_watchdog.c:105: error: 'res.child' may be used uninitialized in this function > drivers/acpi/acpi_watchdog.c:105: error: 'res.sibling' may be used uninitialized in this function > drivers/acpi/acpi_watchdog.c:105: error: 'res.parent' may be used uninitialized in this function > drivers/acpi/acpi_watchdog.c:105: error: 'res.desc' may be used uninitialized in this function > drivers/acpi/acpi_watchdog.c:105: error: 'res.name' may be used uninitialized in this function > > Newer compilers can presumably optimize the uninitialized access > away entirely and don't warn at all, but rely on the kzalloc() > to zero the structure first. This adds an explicit initialization > to force consistent behavior. > > Fixes: 058dfc767008 ("ACPI / watchdog: Add support for WDAT hardware watchdog") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/acpi/acpi_watchdog.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c > index bf22c29d2517..11b113f8e367 100644 > --- a/drivers/acpi/acpi_watchdog.c > +++ b/drivers/acpi/acpi_watchdog.c > @@ -66,7 +66,7 @@ void __init acpi_watchdog_init(void) > for (i = 0; i < wdat->entries; i++) { > const struct acpi_generic_address *gas; > struct resource_entry *rentry; > - struct resource res; > + struct resource res = {}; > bool found; > > gas = &entries[i].register_region; > -- > 2.9.0 > -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Sep 15, 2017 at 09:55:18PM +0200, Arnd Bergmann wrote: > We copy a local resource structure into a list, but only > initialize some of its members, as pointed out by gcc-4.4: > > drivers/acpi/acpi_watchdog.c: In function 'acpi_watchdog_init': > drivers/acpi/acpi_watchdog.c:105: error: 'res.child' may be used uninitialized in this function > drivers/acpi/acpi_watchdog.c:105: error: 'res.sibling' may be used uninitialized in this function > drivers/acpi/acpi_watchdog.c:105: error: 'res.parent' may be used uninitialized in this function > drivers/acpi/acpi_watchdog.c:105: error: 'res.desc' may be used uninitialized in this function > drivers/acpi/acpi_watchdog.c:105: error: 'res.name' may be used uninitialized in this function > > Newer compilers can presumably optimize the uninitialized access > away entirely and don't warn at all, but rely on the kzalloc() > to zero the structure first. This adds an explicit initialization > to force consistent behavior. > > Fixes: 058dfc767008 ("ACPI / watchdog: Add support for WDAT hardware watchdog") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Saturday, September 16, 2017 8:56:49 AM CEST Mika Westerberg wrote: > On Fri, Sep 15, 2017 at 09:55:18PM +0200, Arnd Bergmann wrote: > > We copy a local resource structure into a list, but only > > initialize some of its members, as pointed out by gcc-4.4: > > > > drivers/acpi/acpi_watchdog.c: In function 'acpi_watchdog_init': > > drivers/acpi/acpi_watchdog.c:105: error: 'res.child' may be used uninitialized in this function > > drivers/acpi/acpi_watchdog.c:105: error: 'res.sibling' may be used uninitialized in this function > > drivers/acpi/acpi_watchdog.c:105: error: 'res.parent' may be used uninitialized in this function > > drivers/acpi/acpi_watchdog.c:105: error: 'res.desc' may be used uninitialized in this function > > drivers/acpi/acpi_watchdog.c:105: error: 'res.name' may be used uninitialized in this function > > > > Newer compilers can presumably optimize the uninitialized access > > away entirely and don't warn at all, but rely on the kzalloc() > > to zero the structure first. This adds an explicit initialization > > to force consistent behavior. > > > > Fixes: 058dfc767008 ("ACPI / watchdog: Add support for WDAT hardware watchdog") > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> Applied, thanks! -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c index bf22c29d2517..11b113f8e367 100644 --- a/drivers/acpi/acpi_watchdog.c +++ b/drivers/acpi/acpi_watchdog.c @@ -66,7 +66,7 @@ void __init acpi_watchdog_init(void) for (i = 0; i < wdat->entries; i++) { const struct acpi_generic_address *gas; struct resource_entry *rentry; - struct resource res; + struct resource res = {}; bool found; gas = &entries[i].register_region;
We copy a local resource structure into a list, but only initialize some of its members, as pointed out by gcc-4.4: drivers/acpi/acpi_watchdog.c: In function 'acpi_watchdog_init': drivers/acpi/acpi_watchdog.c:105: error: 'res.child' may be used uninitialized in this function drivers/acpi/acpi_watchdog.c:105: error: 'res.sibling' may be used uninitialized in this function drivers/acpi/acpi_watchdog.c:105: error: 'res.parent' may be used uninitialized in this function drivers/acpi/acpi_watchdog.c:105: error: 'res.desc' may be used uninitialized in this function drivers/acpi/acpi_watchdog.c:105: error: 'res.name' may be used uninitialized in this function Newer compilers can presumably optimize the uninitialized access away entirely and don't warn at all, but rely on the kzalloc() to zero the structure first. This adds an explicit initialization to force consistent behavior. Fixes: 058dfc767008 ("ACPI / watchdog: Add support for WDAT hardware watchdog") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/acpi/acpi_watchdog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html