Prev: audit_tree: sleep inside atomic
Next: tracing: Fix undelared ENOSYS in include/linux/tracepoint.h
From: Jesse Barnes on 21 Jun 2010 11:30
On Mon, 21 Jun 2010 17:02:11 +0200
Jiri Slaby <jslaby(a)suse.cz> wrote:

> Stanse found that there are two NULL checks missing in ips_monitor. So
> check their value too and bail out appropriately if the allocation
> failed.
>
> Signed-off-by: Jiri Slaby <jslaby(a)suse.cz>
> Cc: Jesse Barnes <jbarnes(a)virtuousgeek.org>
> Cc: Matthew Garrett <mjg(a)redhat.com>
> ---
> drivers/platform/x86/intel_ips.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c
> index cdaf40e..3c7ea9a 100644
> --- a/drivers/platform/x86/intel_ips.c
> +++ b/drivers/platform/x86/intel_ips.c
> @@ -931,7 +931,8 @@ static int ips_monitor(void *data)
> mch_samples = kzalloc(sizeof(u16) * IPS_SAMPLE_COUNT, GFP_KERNEL);
> cpu_samples = kzalloc(sizeof(u32) * IPS_SAMPLE_COUNT, GFP_KERNEL);
> mchp_samples = kzalloc(sizeof(u32) * IPS_SAMPLE_COUNT, GFP_KERNEL);
> - if (!mcp_samples || !ctv1_samples || !ctv2_samples || !mch_samples) {
> + if (!mcp_samples || !ctv1_samples || !ctv2_samples || !mch_samples ||
> + !cpu_samples || !mchp_samples) {
> dev_err(&ips->dev->dev,
> "failed to allocate sample array, ips disabled\n");
> kfree(mcp_samples);

Ah cool, am I also missing the appropriate kfree() calls for the last
two? The context doesn't have it. Otherwise,

Acked-by: Jesse Barnes <jbarnes(a)virtuousgeek.org>

--
Jesse Barnes, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Jiri Slaby on 21 Jun 2010 11:40
On 06/21/2010 05:25 PM, Jesse Barnes wrote:
> On Mon, 21 Jun 2010 17:02:11 +0200
> Jiri Slaby <jslaby(a)suse.cz> wrote:
>
>> Stanse found that there are two NULL checks missing in ips_monitor. So
>> check their value too and bail out appropriately if the allocation
>> failed.
>>
>> Signed-off-by: Jiri Slaby <jslaby(a)suse.cz>
>> Cc: Jesse Barnes <jbarnes(a)virtuousgeek.org>
>> Cc: Matthew Garrett <mjg(a)redhat.com>
>> ---
>> drivers/platform/x86/intel_ips.c | 3 ++-
>> 1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c
>> index cdaf40e..3c7ea9a 100644
>> --- a/drivers/platform/x86/intel_ips.c
>> +++ b/drivers/platform/x86/intel_ips.c
>> @@ -931,7 +931,8 @@ static int ips_monitor(void *data)
>> mch_samples = kzalloc(sizeof(u16) * IPS_SAMPLE_COUNT, GFP_KERNEL);
>> cpu_samples = kzalloc(sizeof(u32) * IPS_SAMPLE_COUNT, GFP_KERNEL);
>> mchp_samples = kzalloc(sizeof(u32) * IPS_SAMPLE_COUNT, GFP_KERNEL);
>> - if (!mcp_samples || !ctv1_samples || !ctv2_samples || !mch_samples) {
>> + if (!mcp_samples || !ctv1_samples || !ctv2_samples || !mch_samples ||
>> + !cpu_samples || !mchp_samples) {
>> dev_err(&ips->dev->dev,
>> "failed to allocate sample array, ips disabled\n");
>> kfree(mcp_samples);
>
> Ah cool, am I also missing the appropriate kfree() calls for the last
> two? The context doesn't have it. Otherwise,

I checked when I was patching that and the last is not freed there.
However I didn't add it since at least one must be non-NULL and in this
case it can be only the last. (Until somebody add another allocation
indeed.) So should I add even the last free there?

thanks,
--
js
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Jesse Barnes on 21 Jun 2010 11:40
On Mon, 21 Jun 2010 17:33:48 +0200
Jiri Slaby <jirislaby(a)gmail.com> wrote:

> On 06/21/2010 05:25 PM, Jesse Barnes wrote:
> > On Mon, 21 Jun 2010 17:02:11 +0200
> > Jiri Slaby <jslaby(a)suse.cz> wrote:
> >
> >> Stanse found that there are two NULL checks missing in ips_monitor. So
> >> check their value too and bail out appropriately if the allocation
> >> failed.
> >>
> >> Signed-off-by: Jiri Slaby <jslaby(a)suse.cz>
> >> Cc: Jesse Barnes <jbarnes(a)virtuousgeek.org>
> >> Cc: Matthew Garrett <mjg(a)redhat.com>
> >> ---
> >> drivers/platform/x86/intel_ips.c | 3 ++-
> >> 1 files changed, 2 insertions(+), 1 deletions(-)
> >>
> >> diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c
> >> index cdaf40e..3c7ea9a 100644
> >> --- a/drivers/platform/x86/intel_ips.c
> >> +++ b/drivers/platform/x86/intel_ips.c
> >> @@ -931,7 +931,8 @@ static int ips_monitor(void *data)
> >> mch_samples = kzalloc(sizeof(u16) * IPS_SAMPLE_COUNT, GFP_KERNEL);
> >> cpu_samples = kzalloc(sizeof(u32) * IPS_SAMPLE_COUNT, GFP_KERNEL);
> >> mchp_samples = kzalloc(sizeof(u32) * IPS_SAMPLE_COUNT, GFP_KERNEL);
> >> - if (!mcp_samples || !ctv1_samples || !ctv2_samples || !mch_samples) {
> >> + if (!mcp_samples || !ctv1_samples || !ctv2_samples || !mch_samples ||
> >> + !cpu_samples || !mchp_samples) {
> >> dev_err(&ips->dev->dev,
> >> "failed to allocate sample array, ips disabled\n");
> >> kfree(mcp_samples);
> >
> > Ah cool, am I also missing the appropriate kfree() calls for the last
> > two? The context doesn't have it. Otherwise,
>
> I checked when I was patching that and the last is not freed there.
> However I didn't add it since at least one must be non-NULL and in this
> case it can be only the last. (Until somebody add another allocation
> indeed.) So should I add even the last free there?

Up to Matthew. Not adding it will make people do a double take, but I
agree it'll be safe.

--
Jesse Barnes, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Jesse Barnes on 21 Jun 2010 13:10
On Mon, 21 Jun 2010 17:40:15 +0200
Jiri Slaby <jslaby(a)suse.cz> wrote:

> Or what about this one?
>
> --
>
> Stanse found that there are two NULL checks missing in ips_monitor. So
> check their value too and bail out appropriately if the allocation
> failed.
>
> While at it, add one more kfree to the fail path. It is not necessary
> now, but may be needed in the future when a new allocation is added.
> And for completeness.
>
> Also remove unneeded initialization of the variables. They are all set
> right after their declaration.
>
> Signed-off-by: Jiri Slaby <jslaby(a)suse.cz>
> Cc: Jesse Barnes <jbarnes(a)virtuousgeek.org>
> Cc: Matthew Garrett <mjg(a)redhat.com>
> ---
> drivers/platform/x86/intel_ips.c | 9 +++++----
> 1 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c
> index cdaf40e..0344822 100644
> --- a/drivers/platform/x86/intel_ips.c
> +++ b/drivers/platform/x86/intel_ips.c
> @@ -920,9 +920,8 @@ static int ips_monitor(void *data)
> struct timer_list timer;
> unsigned long seqno_timestamp, expire, last_msecs, last_sample_period;
> int i;
> - u32 *cpu_samples = NULL, *mchp_samples = NULL, old_cpu_power;
> - u16 *mcp_samples = NULL, *ctv1_samples = NULL, *ctv2_samples = NULL,
> - *mch_samples = NULL;
> + u32 *cpu_samples, *mchp_samples, old_cpu_power;
> + u16 *mcp_samples, *ctv1_samples, *ctv2_samples, *mch_samples;
> u8 cur_seqno, last_seqno;
>
> mcp_samples = kzalloc(sizeof(u16) * IPS_SAMPLE_COUNT, GFP_KERNEL);
> @@ -931,7 +930,8 @@ static int ips_monitor(void *data)
> mch_samples = kzalloc(sizeof(u16) * IPS_SAMPLE_COUNT, GFP_KERNEL);
> cpu_samples = kzalloc(sizeof(u32) * IPS_SAMPLE_COUNT, GFP_KERNEL);
> mchp_samples = kzalloc(sizeof(u32) * IPS_SAMPLE_COUNT, GFP_KERNEL);
> - if (!mcp_samples || !ctv1_samples || !ctv2_samples || !mch_samples) {
> + if (!mcp_samples || !ctv1_samples || !ctv2_samples || !mch_samples ||
> + !cpu_samples || !mchp_samples) {
> dev_err(&ips->dev->dev,
> "failed to allocate sample array, ips disabled\n");
> kfree(mcp_samples);
> @@ -939,6 +939,7 @@ static int ips_monitor(void *data)
> kfree(ctv2_samples);
> kfree(mch_samples);
> kfree(cpu_samples);
> + kfree(mchp_samples);
> kthread_stop(ips->adjust);
> return -ENOMEM;
> }

Even better.

Acked-by: Jesse Barnes <jbarnes(a)virtuousgeek.org>

Thanks,
--
Jesse Barnes, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: audit_tree: sleep inside atomic
Next: tracing: Fix undelared ENOSYS in include/linux/tracepoint.h