Skip to content

Commit 18d9489

Browse files
tyhicksgregkh
authored andcommitted
irda: Only insert new objects into the global database via setsockopt
The irda_setsockopt() function conditionally allocates memory for a new self->ias_object or, in some cases, reuses the existing self->ias_object. Existing objects were incorrectly reinserted into the LM_IAS database which corrupted the doubly linked list used for the hashbin implementation of the LM_IAS database. When combined with a memory leak in irda_bind(), this issue could be leveraged to create a use-after-free vulnerability in the hashbin list. This patch fixes the issue by only inserting newly allocated objects into the database. CVE-2018-6555 Fixes: 1da177e ("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>
1 parent ce54bf4 commit 18d9489

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

net/irda/af_irda.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2023,7 +2023,11 @@ static int irda_setsockopt(struct socket *sock, int level, int optname,
20232023
err = -EINVAL;
20242024
goto out;
20252025
}
2026-
irias_insert_object(ias_obj);
2026+
2027+
/* Only insert newly allocated objects */
2028+
if (free_ias)
2029+
irias_insert_object(ias_obj);
2030+
20272031
kfree(ias_opt);
20282032
break;
20292033
case IRLMP_IAS_DEL:

0 commit comments

Comments
 (0)