summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTyler Hicks <tyhicks@canonical.com>2018-09-04 15:24:04 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-15 09:43:01 +0200
commitce54bf4aec595c479b462180d682783b3776fb80 (patch)
tree2cd13b00b4522cec665dfcf5ab947b6c3cd42ce8
parenta75228044ef6f99b057784d46b98df0cd0dd8a5b (diff)
downloadlinux-stable-ce54bf4aec595c479b462180d682783b3776fb80.tar.gz
linux-stable-ce54bf4aec595c479b462180d682783b3776fb80.tar.bz2
linux-stable-ce54bf4aec595c479b462180d682783b3776fb80.zip
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>
-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 101ed6c42808..b85fa22806f6 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -774,6 +774,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) &&