2013-04-05 16:17:10

by Jan-Simon Möller

Subject: [PATCH] [TRIVIAL] FIX: unintended variable name reuse

Cleanup a variable name reuse.


Fix suggested by PaX Team <[email protected]>
Signed-off-by: Jan-Simon Möller <[email protected]>
---
arch/x86/kernel/cpu/perf_event_intel_uncore.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index b43200d..4c783be 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -2428,7 +2428,7 @@ static void __init uncore_types_exit(struct
intel_uncore_type **types)
static int __init uncore_type_init(struct intel_uncore_type *type)
{
struct intel_uncore_pmu *pmus;
- struct attribute_group *events_group;
+ struct attribute_group *attr_group;
struct attribute **attrs;
int i, j;

@@ -2455,19 +2455,19 @@ static int __init uncore_type_init(struct
intel_uncore_type *type)
while (type->event_descs[i].attr.attr.name)
i++;

- events_group = kzalloc(sizeof(struct attribute *) * (i + 1) +
- sizeof(*events_group), GFP_KERNEL);
- if (!events_group)
+ attr_group = kzalloc(sizeof(struct attribute *) * (i + 1) +
+ sizeof(*attr_group), GFP_KERNEL);
+ if (!attr_group)
goto fail;

- attrs = (struct attribute **)(events_group + 1);
- events_group->name = "events";
- events_group->attrs = attrs;
+ attrs = (struct attribute **)(attr_group + 1);
+ attr_group->name = "events";
+ attr_group->attrs = attrs;

for (j = 0; j < i; j++)
attrs[j] = &type->event_descs[j].attr.attr;

- type->events_group = events_group;
+ type->events_group = attr_group;
}

type->pmu_group = &uncore_pmu_attr_group;
--
1.8.1.4

2013-04-05 17:15:12

by PaX Team

Subject: Re: [PATCH] [TRIVIAL] FIX: unintended variable name reuse

On 5 Apr 2013 at 18:17, Jan-Simon Möller wrote:

> Cleanup a variable name reuse.
>
>
> Fix suggested by PaX Team <[email protected]>

Reviewed-by: PaX Team <[email protected]>

> Signed-off-by: Jan-Simon Möller <[email protected]>
> ---
> arch/x86/kernel/cpu/perf_event_intel_uncore.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)