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

Commit 79deb3c1 authored by Tariq Saeed's avatar Tariq Saeed Committed by Linus Torvalds
Browse files

ocfs2/o2net: incorrect to terminate accepting connections loop upon rejecting an invalid one 



When o2net-accept-one() rejects an illegal connection, it terminates the
loop picking up the remaining queued connections.  This fix will
continue accepting connections till the queue is emtpy.

Addresses Orabug 17489469.

Signed-off-by: default avatarTariq Saseed <tariq.x.saeed@oracle.com>
Signed-off-by: default avatarSrinivas Eeda <srinivas.eeda@oracle.com>
Reviewed-by: default avatarMark Fasheh <mfasheh@suse.de>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1d21b1bf

fs/ocfs2/cluster/tcp.c

+29 −2
Original line number Diff line number Diff line
@@ -1799,7 +1799,7 @@ int o2net_register_hb_callbacks(void) 


/* ------------------------------------------------------------ */



static int o2net_accept_one(struct socket *sock)

static int o2net_accept_one(struct socket *sock, int *more)

{

	int ret, slen;

	struct sockaddr_in sin;
@@ -1810,6 +1810,7 @@ static int o2net_accept_one(struct socket *sock) 
	struct o2net_node *nn;



	BUG_ON(sock == NULL);

	*more = 0;

	ret = sock_create_lite(sock->sk->sk_family, sock->sk->sk_type,

			       sock->sk->sk_protocol, &new_sock);

	if (ret)
@@ -1821,6 +1822,7 @@ static int o2net_accept_one(struct socket *sock) 
	if (ret < 0)

		goto out;



	*more = 1;

	new_sock->sk->sk_allocation = GFP_ATOMIC;



	ret = o2net_set_nodelay(new_sock);
@@ -1919,12 +1921,37 @@ out: 
	return ret;

}



/*

 * This function is invoked in response to one or more

 * pending accepts at softIRQ level. We must drain the

 * entire que before returning.

 */



static void o2net_accept_many(struct work_struct *work)

{

	struct socket *sock = o2net_listen_sock;

	while (o2net_accept_one(sock) == 0)

	int	more;

	int	err;



	/*

	 * It is critical to note that due to interrupt moderation

	 * at the network driver level, we can't assume to get a

	 * softIRQ for every single conn since tcp SYN packets

	 * can arrive back-to-back, and therefore many pending

	 * accepts may result in just 1 softIRQ. If we terminate

	 * the o2net_accept_one() loop upon seeing an err, what happens

	 * to the rest of the conns in the queue? If no new SYN

	 * arrives for hours, no softIRQ  will be delivered,

	 * and the connections will just sit in the queue.

	 */



	for (;;) {

		err = o2net_accept_one(sock, &more);

		if (!more)

			break;

		cond_resched();

	}

}



static void o2net_listen_data_ready(struct sock *sk)

{