| To: | chas williams - CONTRACTOR <chas@xxxxxxxxxxxxxxxx> |
|---|---|
| Subject: | Re: [PATCH 1/8][ATM]: [zatm] eliminate kfree warning (from Tobias Hirning <sskyman@web.de>) |
| From: | Jakub Jelinek <jakub@xxxxxxxxxx> |
| Date: | Wed, 20 Jul 2005 09:19:20 +0200 |
| Cc: | netdev@xxxxxxxxxxx, davem@xxxxxxxxxxxxx |
| In-reply-to: | <200507192044.j6JKirFb027183@ginger.cmf.nrl.navy.mil> |
| References: | <200507192044.j6JKirFb027183@ginger.cmf.nrl.navy.mil> |
| Reply-to: | Jakub Jelinek <jakub@xxxxxxxxxx> |
| Sender: | netdev-bounce@xxxxxxxxxxx |
| User-agent: | Mutt/1.4.1i |
On Tue, Jul 19, 2005 at 04:44:54PM -0400, chas williams - CONTRACTOR wrote:
> please apply to 2.6 -- thanks!
>
> [ATM]: [zatm] eliminate kfree warning (from Tobias Hirning <sskyman@xxxxxx>)
>
> Signed-off-by: Chas Williams <chas@xxxxxxxxxxxxxxxx>
>
>
> ---
> commit 4932248439d20412610ffaade625cbde0e001e37
> tree 35a60e3551f5f1abced8a435238575c488041af6
> parent 238921d2cb04eb6dcc2ff5914d555d7dcaa4dfc5
> author chas williams <chas@relax.(none)> Wed, 06 Jul 2005 13:10:18 -0400
> committer chas williams <chas@relax.(none)> Wed, 06 Jul 2005 13:10:18 -0400
>
> drivers/atm/zatm.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
> --- a/drivers/atm/zatm.c
> +++ b/drivers/atm/zatm.c
> @@ -1339,7 +1339,7 @@ static int __init zatm_start(struct atm_
> return 0;
> out:
> for (i = 0; i < NR_MBX; i++)
> - kfree(zatm_dev->mbx_start[i]);
> + kfree(&zatm_dev->mbx_start[i]);
This can't be right. zatm_dev->mbx_start[i] is allocated with:
1306 here = (unsigned long) kmalloc(2*MBX_SIZE(i),
1307 GFP_KERNEL);
1308 if (!here) {
1309 error = -ENOMEM;
1310 goto out;
1311 }
1312 if ((here^(here+MBX_SIZE(i))) & ~0xffffUL)/*
paranoia */
1313 here = (here & ~0xffffUL)+0x10000;
1314 zatm_dev->mbx_start[i] = here;
so even kfree((void *)zatm_dev->mbx_start[i]); is wrong in case
there was an alignment, but kfree(&zatm_dev->mbx_start[i])
is wrong in all cases.
Jakub
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [patch linux-2.6.13-rc2-gitXX 1/1] zatm: mailbox converted to pci_alloc_consistent(), Francois Romieu |
|---|---|
| Next by Date: | Re: [patch linux-2.6.13-rc2-gitXX 1/1] zatm: mailbox converted to pci_alloc_consistent(), chas |
| Previous by Thread: | Re: [patch linux-2.6.13-rc2-gitXX 1/1] zatm: mailbox converted to pci_alloc_consistent(), David S. Miller |
| Next by Thread: | Re: [PATCH 1/8][ATM]: [zatm] eliminate kfree warning (from Tobias Hirning <sskyman@web.de>), David S. Miller |
| Indexes: | [Date] [Thread] [Top] [All Lists] |