Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7355827 authored by tsutomu.owa@toshiba.co.jp's avatar tsutomu.owa@toshiba.co.jp Committed by David Teigland
Browse files

DLM: fix to use sock_mutex correctly in xxx_accept_from_sock 



In the current implementation, we think that exclusion control
for othercon in tcp_accept_from_sock() and sctp_accept_from_sock()
was not enough. We fix them.

Signed-off-by: default avatarTadashi Miyauchi <miyauchi@toshiba-tops.co.jp>
Signed-off-by: default avatarTsutomu Owa <tsutomu.owa@toshiba.co.jp>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent b2a66629

fs/dlm/lowcomms.c

+6 −0
Original line number Diff line number Diff line
@@ -801,16 +801,19 @@ static int tcp_accept_from_sock(struct connection *con) 
			INIT_WORK(&othercon->rwork, process_recv_sockets);

			set_bit(CF_IS_OTHERCON, &othercon->flags);

		}

		mutex_lock_nested(&othercon->sock_mutex, 2);

		if (!othercon->sock) {

			newcon->othercon = othercon;

			othercon->sock = newsock;

			newsock->sk->sk_user_data = othercon;

			add_sock(newsock, othercon);

			addcon = othercon;

			mutex_unlock(&othercon->sock_mutex);

		}

		else {

			printk("Extra connection from node %d attempted\n", nodeid);

			result = -EAGAIN;

			mutex_unlock(&othercon->sock_mutex);

			mutex_unlock(&newcon->sock_mutex);

			goto accept_err;

		}
@@ -918,15 +921,18 @@ static int sctp_accept_from_sock(struct connection *con) 
			INIT_WORK(&othercon->rwork, process_recv_sockets);

			set_bit(CF_IS_OTHERCON, &othercon->flags);

		}

		mutex_lock_nested(&othercon->sock_mutex, 2);

		if (!othercon->sock) {

			newcon->othercon = othercon;

			othercon->sock = newsock;

			newsock->sk->sk_user_data = othercon;

			add_sock(newsock, othercon);

			addcon = othercon;

			mutex_unlock(&othercon->sock_mutex);

		} else {

			printk("Extra connection from node %d attempted\n", nodeid);

			ret = -EAGAIN;

			mutex_unlock(&othercon->sock_mutex);

			mutex_unlock(&newcon->sock_mutex);

			goto accept_err;

		}