| Message ID | 20220324190950.70486-2-dave@stgolabs.net |
|---|---|
| State | Accepted |
| Commit | bdff938d04409aba0e43e408ee47d45d1486b2ae |
| Headers | show |
| Series | thermal: int340x: Misc acpi_buffer handling updates | expand |
On Thu, 2022-03-24 at 12:09 -0700, Davidlohr Bueso wrote: > It is the caller's responsibility to free only upon ACPI_SUCCESS. > Since context->ret.pointer will be NULL on failure so calling kfree will just return. Although we can avoid this call to kfree. Thanks, Srinivas > Signed-off-by: Davidlohr Bueso <dave@stgolabs.net> > --- > drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > index 4954800b9850..0e7931c286ec 100644 > --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > @@ -186,11 +186,11 @@ static int int3400_thermal_run_osc(acpi_handle > handle, char *uuid_str, int *enab > ret = *((u32 *)(context.ret.pointer + 4)); > if (ret != *enable) > result = -EPERM; > + > + kfree(context.ret.pointer); > } else > result = -EPERM; > > - kfree(context.ret.pointer); > - > return result; > } >
On Thu, Mar 24, 2022 at 8:10 PM Davidlohr Bueso <dave@stgolabs.net> wrote: > > It is the caller's responsibility to free only upon ACPI_SUCCESS. > > Signed-off-by: Davidlohr Bueso <dave@stgolabs.net> > --- > drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > index 4954800b9850..0e7931c286ec 100644 > --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c > @@ -186,11 +186,11 @@ static int int3400_thermal_run_osc(acpi_handle handle, char *uuid_str, int *enab > ret = *((u32 *)(context.ret.pointer + 4)); > if (ret != *enable) > result = -EPERM; > + > + kfree(context.ret.pointer); > } else > result = -EPERM; > > - kfree(context.ret.pointer); > - > return result; > } > > -- Because the code before the change is not incorrect, this is a cleanup rather than a fix, so I've adjusted the subject a bit and applied this along with the [2-3/3] as 5.19 material. Thanks!
diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c index 4954800b9850..0e7931c286ec 100644 --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c @@ -186,11 +186,11 @@ static int int3400_thermal_run_osc(acpi_handle handle, char *uuid_str, int *enab ret = *((u32 *)(context.ret.pointer + 4)); if (ret != *enable) result = -EPERM; + + kfree(context.ret.pointer); } else result = -EPERM; - kfree(context.ret.pointer); - return result; }
It is the caller's responsibility to free only upon ACPI_SUCCESS. Signed-off-by: Davidlohr Bueso <dave@stgolabs.net> --- drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)