kcm: fix a socket double free
authorWANG Cong <xiyou.wangcong@gmail.com>
Mon, 29 Aug 2016 04:28:26 +0000 (21:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 1 Sep 2016 04:00:19 +0000 (21:00 -0700)
commitc0338aff2260ea6c092806312dbb154cec07a242
tree78da2b443e5210c8913e17fe15ad9da2ee9680c1
parent3b631e52f7c741a1813b6fc631acca25591972a4
kcm: fix a socket double free

Dmitry reported a double free on kcm socket, which could
be easily reproduced by:

#include <unistd.h>
#include <sys/syscall.h>

int main()
{
  int fd = syscall(SYS_socket, 0x29ul, 0x5ul, 0x0ul, 0, 0, 0);
  syscall(SYS_ioctl, fd, 0x89e2ul, 0x20a98000ul, 0, 0, 0);
  return 0;
}

This is because on the error path, after we install
the new socket file, we call sock_release() to clean
up the socket, which leaves the fd pointing to a freed
socket. Fix this by calling sys_close() on that fd
directly.

Fixes: ab7ac4eb9832 ("kcm: Kernel Connection Multiplexor module")
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Cc: Tom Herbert <tom@herbertland.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/kcm/kcmsock.c