redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

claw: fix memory leak in claw_probe.

Browse source 
probe_error() frees memory only, if cgdev->dev.driver_data refers
to the claw_privbk structure. Move forward its setting in claw_probe()
to ensure proper freeing of claw_privbk allocations.

Cc: Daniel <danielm77@spray.se>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Martin Schwidefsky 2008-08-21 17:10:22 +02:00 committed by Jeff Garzik
parent d3d7b53d1a
commit 2b356b4639
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/s390/net/claw.c
View file

@ -271,6 +271,7 @@ claw_probe(struct ccwgroup_device *cgdev)
if (!get_device(&cgdev->dev)) if (!get_device(&cgdev->dev))
return -ENODEV; return -ENODEV;
privptr = kzalloc(sizeof(struct claw_privbk), GFP_KERNEL); privptr = kzalloc(sizeof(struct claw_privbk), GFP_KERNEL);
cgdev->dev.driver_data = privptr;
if (privptr == NULL) { if (privptr == NULL) {
probe_error(cgdev); probe_error(cgdev);
put_device(&cgdev->dev); put_device(&cgdev->dev);
@ -305,7 +306,6 @@ claw_probe(struct ccwgroup_device *cgdev)
privptr->p_env->p_priv = privptr; privptr->p_env->p_priv = privptr;
cgdev->cdev[0]->handler = claw_irq_handler; cgdev->cdev[0]->handler = claw_irq_handler;
cgdev->cdev[1]->handler = claw_irq_handler; cgdev->cdev[1]->handler = claw_irq_handler;
cgdev->dev.driver_data = privptr;
CLAW_DBF_TEXT(2, setup, "prbext 0"); CLAW_DBF_TEXT(2, setup, "prbext 0");
return 0; return 0;
@ -1960,19 +1960,16 @@ init_ccw_bk(struct net_device *dev)
static void static void
probe_error( struct ccwgroup_device *cgdev) probe_error( struct ccwgroup_device *cgdev)
{ {
struct claw_privbk *privptr; struct claw_privbk *privptr;
CLAW_DBF_TEXT(4, trace, "proberr"); CLAW_DBF_TEXT(4, trace, "proberr");
privptr=(struct claw_privbk *)cgdev->dev.driver_data; privptr = (struct claw_privbk *) cgdev->dev.driver_data;
if (privptr!=NULL) { if (privptr != NULL) {
cgdev->dev.driver_data = NULL;
kfree(privptr->p_env); kfree(privptr->p_env);
privptr->p_env=NULL; kfree(privptr->p_mtc_envelope);
kfree(privptr->p_mtc_envelope); kfree(privptr);
privptr->p_mtc_envelope=NULL; }
kfree(privptr);
privptr=NULL;
}
return;
} /* probe_error */ } /* probe_error */
/*-------------------------------------------------------------------* /*-------------------------------------------------------------------*