Merge tag 'rxrpc-20140126' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs (cd0c75a7) · Commits · 戴 / test

David Howells says: ==================== RxRPC fixes Here are some small AF_RXRPC fixes. (1) Fix a place where a spinlock is taken conditionally but is released unconditionally. (2) Fix a double-free that happens when cleaning up on a checksum error. (3) Fix handling of CHECKSUM_PARTIAL whilst delivering messages to userspace. ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

net/rxrpc/ar-connection.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -381,6 +381,8 @@ static int rxrpc_connect_exclusive(struct rxrpc_sock *rx,

		rxrpc_assign_connection_id(conn);
		rx->conn = conn;
		} else {
		spin_lock(&trans->client_lock);
		}

		/* we've got a connection with a free channel and we can now attach the

net/rxrpc/ar-recvmsg.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -180,7 +180,8 @@ int rxrpc_recvmsg(struct kiocb iocb, struct socket sock,
		if (copy > len - copied)
		copy = len - copied;

		if (skb->ip_summed == CHECKSUM_UNNECESSARY) {
		if (skb->ip_summed == CHECKSUM_UNNECESSARY \|\|
		skb->ip_summed == CHECKSUM_PARTIAL) {
		ret = skb_copy_datagram_iovec(skb, offset,
		msg->msg_iov, copy);
		} else {
		@@ -353,6 +354,10 @@ csum_copy_error:
		if (continue_call)
		rxrpc_put_call(continue_call);
		rxrpc_kill_skb(skb);
		if (!(flags & MSG_PEEK)) {
		if (skb_dequeue(&rx->sk.sk_receive_queue) != skb)
		BUG();
		}
		skb_kill_datagram(&rx->sk, skb, flags);
		rxrpc_put_call(call);
		return -EAGAIN;

Admin message