diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-30 18:35:24 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-26 17:18:12 -0700 |
| commit | 2f2c0c6440110d7436f202ecf918734243e7b870 (patch) | |
| tree | 792de2a1607ba246f933e614d79657a7e0744e74 | |
| parent | 88c2651de40107913811814405591d9077d71b02 (diff) | |
| download | kernel-common-2f2c0c6440110d7436f202ecf918734243e7b870.tar.gz kernel-common-2f2c0c6440110d7436f202ecf918734243e7b870.tar.bz2 kernel-common-2f2c0c6440110d7436f202ecf918734243e7b870.zip | |
irda: Correctly clean up self->ias_obj on irda_bind() failure.
[ Upstream commit 628e300cccaa628d8fb92aa28cb7530a3d5f2257 ]
If irda_open_tsap() fails, the irda_bind() code tries to destroy
the ->ias_obj object by hand, but does so wrongly.
In particular, it fails to a) release the hashbin attached to the
object and b) reset the self->ias_obj pointer to NULL.
Fix both problems by using irias_delete_object() and explicitly
setting self->ias_obj to NULL, just as irda_release() does.
Reported-by: Tavis Ormandy <taviso@cmpxchg8b.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | net/irda/af_irda.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index 79986a674f6e..fd55b5135de5 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -824,8 +824,8 @@ static int irda_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) err = irda_open_tsap(self, addr->sir_lsap_sel, addr->sir_name); if (err < 0) { - kfree(self->ias_obj->name); - kfree(self->ias_obj); + irias_delete_object(self->ias_obj); + self->ias_obj = NULL; goto out; } |