summaryrefslogtreecommitdiff
path: root/net/irda
diff options
context:
space:
mode:
authorTyler Hicks <tyhicks@canonical.com>2018-09-04 18:24:04 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-26 09:33:52 +0300
commit9f0547e071f848a665056e18c70cc2741a96ca76 (patch)
tree461cdd3ae49228400f0ecf837605677c5629f0aa /net/irda
parent2daf1a7495833dad8ac2875906b471a0d55e6238 (diff)
downloadlinux-9f0547e071f848a665056e18c70cc2741a96ca76.tar.xz
irda: Fix memory leak caused by repeated binds of irda socket
The irda_bind() function allocates memory for self->ias_obj without checking to see if the socket is already bound. A userspace process could repeatedly bind the socket, have each new object added into the LM-IAS database, and lose the reference to the old object assigned to the socket to exhaust memory resources. This patch errors out of the bind operation when self->ias_obj is already assigned. CVE-2018-6554 Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Reviewed-by: Seth Arnold <seth.arnold@canonical.com> Reviewed-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/irda')
-rw-r--r--net/irda/af_irda.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index 556e3b0f77ba..70a1fd69d4de 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -785,6 +785,13 @@ static int irda_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
return -EINVAL;
lock_sock(sk);
+
+ /* Ensure that the socket is not already bound */
+ if (self->ias_obj) {
+ err = -EINVAL;
+ goto out;
+ }
+
#ifdef CONFIG_IRDA_ULTRA
/* Special care for Ultra sockets */
if ((sk->sk_type == SOCK_DGRAM) &&