| Message ID | 20211110232824.1372368-1-colin.i.king@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 255e51da15baed47531beefd02f222e4dc01f1c1 |
| Headers | show |
| Series | [V2] MIPS: generic/yamon-dt: fix uninitialized variable error | expand |
On Wed, Nov 10, 2021 at 11:28:24PM +0000, Colin Ian King wrote: > In the case where fw_getenv returns an error when fetching values > for ememsizea and memsize then variable phys_memsize is not assigned > a variable and will be uninitialized on a zero check of phys_memsize. > Fix this by initializing phys_memsize to zero. > > Cleans up cppcheck error: > arch/mips/generic/yamon-dt.c:100:7: error: Uninitialized variable: phys_memsize [uninitvar] > > Fixes: f41d2430bbd6 ("MIPS: generic/yamon-dt: Support > 256MB of RAM") > Signed-off-by: Colin Ian King <colin.i.king@gmail.com> > --- > V2: Use correct email address in SoB. > --- > arch/mips/generic/yamon-dt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/mips/generic/yamon-dt.c b/arch/mips/generic/yamon-dt.c > index a3aa22c77cad..a07a5edbcda7 100644 > --- a/arch/mips/generic/yamon-dt.c > +++ b/arch/mips/generic/yamon-dt.c > @@ -75,7 +75,7 @@ static unsigned int __init gen_fdt_mem_array( > __init int yamon_dt_append_memory(void *fdt, > const struct yamon_mem_region *regions) > { > - unsigned long phys_memsize, memsize; > + unsigned long phys_memsize = 0, memsize; > __be32 mem_array[2 * MAX_MEM_ARRAY_ENTRIES]; > unsigned int mem_entries; > int i, err, mem_off; > -- > 2.32.0 applied to mips-fixes. Thomas.
diff --git a/arch/mips/generic/yamon-dt.c b/arch/mips/generic/yamon-dt.c index a3aa22c77cad..a07a5edbcda7 100644 --- a/arch/mips/generic/yamon-dt.c +++ b/arch/mips/generic/yamon-dt.c @@ -75,7 +75,7 @@ static unsigned int __init gen_fdt_mem_array( __init int yamon_dt_append_memory(void *fdt, const struct yamon_mem_region *regions) { - unsigned long phys_memsize, memsize; + unsigned long phys_memsize = 0, memsize; __be32 mem_array[2 * MAX_MEM_ARRAY_ENTRIES]; unsigned int mem_entries; int i, err, mem_off;
In the case where fw_getenv returns an error when fetching values for ememsizea and memsize then variable phys_memsize is not assigned a variable and will be uninitialized on a zero check of phys_memsize. Fix this by initializing phys_memsize to zero. Cleans up cppcheck error: arch/mips/generic/yamon-dt.c:100:7: error: Uninitialized variable: phys_memsize [uninitvar] Fixes: f41d2430bbd6 ("MIPS: generic/yamon-dt: Support > 256MB of RAM") Signed-off-by: Colin Ian King <colin.i.king@gmail.com> --- V2: Use correct email address in SoB. --- arch/mips/generic/yamon-dt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)