| Message ID | 20191126074025.5112-1-roy.van.doormaal@prodrive-technologies.com |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [v2] irqchip/aspeed-i2c-ic: Fix irq domain name memory leak | expand |
On 2019-11-26 07:40, Roy van Doormaal wrote: > The aspeed irqchip driver overwrites the default irq domain name, > but doesn't free the existing domain name. > This patch frees the irq domain name before overwriting it. > > kmemleak trace: > > unreferenced object 0xb8004c40 (size 64): > comm "swapper", pid 0, jiffies 4294937303 (age 747.660s) > hex dump (first 32 bytes): > 3a 61 68 62 3a 61 70 62 3a 62 75 73 40 31 65 37 :ahb:apb:bus@1e7 > 38 61 30 30 30 3a 69 6e 74 65 72 72 75 70 74 2d 8a000:interrupt- > backtrace: > [<086b59b8>] kmemleak_alloc+0xa8/0xc0 > [<b5a3490c>] __kmalloc_track_caller+0x118/0x1a0 > [<f59c7ced>] kvasprintf+0x5c/0xc0 > [<49275eec>] kasprintf+0x30/0x50 > [<5713064b>] __irq_domain_add+0x184/0x25c > [<53c594d0>] aspeed_i2c_ic_of_init+0x9c/0x128 > [<d8d7017e>] of_irq_init+0x1ec/0x314 > [<f8405bf1>] irqchip_init+0x1c/0x24 > [<7ef974b3>] init_IRQ+0x30/0x90 > [<87a1438f>] start_kernel+0x28c/0x458 > [< (null)>] (null) > [<f0763fdf>] 0xffffffff > > Signed-off-by: Roy van Doormaal > <roy.van.doormaal@prodrive-technologies.com> > --- > Changes in v2: > - drop irq domain name assignment by the aspeed irqchip driver Which is good, except that the commit message doesn't quite reflect what this patch does anymore. I'll fix it when picking it for -rc1. Thanks, M. > --- > drivers/irqchip/irq-aspeed-i2c-ic.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/irqchip/irq-aspeed-i2c-ic.c > b/drivers/irqchip/irq-aspeed-i2c-ic.c > index 8d591c179f81..0bd46f63a3c3 100644 > --- a/drivers/irqchip/irq-aspeed-i2c-ic.c > +++ b/drivers/irqchip/irq-aspeed-i2c-ic.c > @@ -92,8 +92,6 @@ static int __init aspeed_i2c_ic_of_init(struct > device_node *node, > goto err_iounmap; > } > > - i2c_ic->irq_domain->name = "aspeed-i2c-domain"; > - > irq_set_chained_handler_and_data(i2c_ic->parent_irq, > aspeed_i2c_ic_irq_handler, i2c_ic);
On Mon, Nov 25, 2019 at 11:41 PM Roy van Doormaal <roy.van.doormaal@prodrive-technologies.com> wrote: > > The aspeed irqchip driver overwrites the default irq domain name, > but doesn't free the existing domain name. > This patch frees the irq domain name before overwriting it. > > kmemleak trace: > > unreferenced object 0xb8004c40 (size 64): > comm "swapper", pid 0, jiffies 4294937303 (age 747.660s) > hex dump (first 32 bytes): > 3a 61 68 62 3a 61 70 62 3a 62 75 73 40 31 65 37 :ahb:apb:bus@1e7 > 38 61 30 30 30 3a 69 6e 74 65 72 72 75 70 74 2d 8a000:interrupt- > backtrace: > [<086b59b8>] kmemleak_alloc+0xa8/0xc0 > [<b5a3490c>] __kmalloc_track_caller+0x118/0x1a0 > [<f59c7ced>] kvasprintf+0x5c/0xc0 > [<49275eec>] kasprintf+0x30/0x50 > [<5713064b>] __irq_domain_add+0x184/0x25c > [<53c594d0>] aspeed_i2c_ic_of_init+0x9c/0x128 > [<d8d7017e>] of_irq_init+0x1ec/0x314 > [<f8405bf1>] irqchip_init+0x1c/0x24 > [<7ef974b3>] init_IRQ+0x30/0x90 > [<87a1438f>] start_kernel+0x28c/0x458 > [< (null)>] (null) > [<f0763fdf>] 0xffffffff > > Signed-off-by: Roy van Doormaal <roy.van.doormaal@prodrive-technologies.com> Acked-by: Brendan Higgins <brendanhiggins@google.com> Sorry for the delayed response.
diff --git a/drivers/irqchip/irq-aspeed-i2c-ic.c b/drivers/irqchip/irq-aspeed-i2c-ic.c index 8d591c179f81..0bd46f63a3c3 100644 --- a/drivers/irqchip/irq-aspeed-i2c-ic.c +++ b/drivers/irqchip/irq-aspeed-i2c-ic.c @@ -92,8 +92,6 @@ static int __init aspeed_i2c_ic_of_init(struct device_node *node, goto err_iounmap; } - i2c_ic->irq_domain->name = "aspeed-i2c-domain"; - irq_set_chained_handler_and_data(i2c_ic->parent_irq, aspeed_i2c_ic_irq_handler, i2c_ic);
The aspeed irqchip driver overwrites the default irq domain name, but doesn't free the existing domain name. This patch frees the irq domain name before overwriting it. kmemleak trace: unreferenced object 0xb8004c40 (size 64): comm "swapper", pid 0, jiffies 4294937303 (age 747.660s) hex dump (first 32 bytes): 3a 61 68 62 3a 61 70 62 3a 62 75 73 40 31 65 37 :ahb:apb:bus@1e7 38 61 30 30 30 3a 69 6e 74 65 72 72 75 70 74 2d 8a000:interrupt- backtrace: [<086b59b8>] kmemleak_alloc+0xa8/0xc0 [<b5a3490c>] __kmalloc_track_caller+0x118/0x1a0 [<f59c7ced>] kvasprintf+0x5c/0xc0 [<49275eec>] kasprintf+0x30/0x50 [<5713064b>] __irq_domain_add+0x184/0x25c [<53c594d0>] aspeed_i2c_ic_of_init+0x9c/0x128 [<d8d7017e>] of_irq_init+0x1ec/0x314 [<f8405bf1>] irqchip_init+0x1c/0x24 [<7ef974b3>] init_IRQ+0x30/0x90 [<87a1438f>] start_kernel+0x28c/0x458 [< (null)>] (null) [<f0763fdf>] 0xffffffff Signed-off-by: Roy van Doormaal <roy.van.doormaal@prodrive-technologies.com> --- Changes in v2: - drop irq domain name assignment by the aspeed irqchip driver --- drivers/irqchip/irq-aspeed-i2c-ic.c | 2 -- 1 file changed, 2 deletions(-)