| Message ID | 20220923152009.1721739-1-nathan@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Daniel Lezcano |
| Headers | show |
| Series | [-next] thermal/intel/int340x: Initialized ret in error path in int340x_thermal_zone_add() | expand |
On 23/09/2022 17:20, Nathan Chancellor wrote: > Clang warns: > > drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c:222:6: error: variable 'ret' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized] > if (!int34x_thermal_zone->ops) > ^~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c:279:17: note: uninitialized use occurs here > return ERR_PTR(ret); > ^~~ > drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c:222:2: note: remove the 'if' if its condition is always false > if (!int34x_thermal_zone->ops) > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c:211:9: note: initialize the variable 'ret' to silence this warning > int ret; > ^ > = 0 > 1 error generated. > > If kmemdup() fails, -ENOMEM should be returned. > > Fixes: f6f6f9a01374 ("thermal/intel/int340x: Replace parameter to simplify") > Link: https://github.com/ClangBuiltLinux/linux/issues/1717 > Reported-by: "kernelci.org bot" <bot@kernelci.org> > Reported-by: "Sudip Mukherjee (Codethink)" <sudipm.mukherjee@gmail.com> > Signed-off-by: Nathan Chancellor <nathan@kernel.org> > --- I've folded this patch with the changes introducing the issue Thanks for the fix
diff --git a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c index ea05be8c2834..228f44260b27 100644 --- a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +++ b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c @@ -219,8 +219,10 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev, int34x_thermal_zone->ops = kmemdup(&int340x_thermal_zone_ops, sizeof(int340x_thermal_zone_ops), GFP_KERNEL); - if (!int34x_thermal_zone->ops) + if (!int34x_thermal_zone->ops) { + ret = -ENOMEM; goto err_ops_alloc; + } if (get_temp) int34x_thermal_zone->ops->get_temp = get_temp;
Clang warns: drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c:222:6: error: variable 'ret' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized] if (!int34x_thermal_zone->ops) ^~~~~~~~~~~~~~~~~~~~~~~~~ drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c:279:17: note: uninitialized use occurs here return ERR_PTR(ret); ^~~ drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c:222:2: note: remove the 'if' if its condition is always false if (!int34x_thermal_zone->ops) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c:211:9: note: initialize the variable 'ret' to silence this warning int ret; ^ = 0 1 error generated. If kmemdup() fails, -ENOMEM should be returned. Fixes: f6f6f9a01374 ("thermal/intel/int340x: Replace parameter to simplify") Link: https://github.com/ClangBuiltLinux/linux/issues/1717 Reported-by: "kernelci.org bot" <bot@kernelci.org> Reported-by: "Sudip Mukherjee (Codethink)" <sudipm.mukherjee@gmail.com> Signed-off-by: Nathan Chancellor <nathan@kernel.org> --- drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) base-commit: 2b109cffe6836f0bb464639cdcc59fc537e3ba41