Commit 4b087b28 authored by Allan Stephens's avatar Allan Stephens Committed by David S. Miller
Browse files

[TIPC]: recvmsg() now returns TIPC ancillary data using correct level (SOL_TIPC) 



Signed-off-by: default avatarAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: default avatarPer Liden <per.liden@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 49978651

net/tipc/socket.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -744,10 +744,10 @@ static int anc_data_recv(struct msghdr *m, struct tipc_msg *msg, 
	if (unlikely(err)) {

	if (unlikely(err)) {

		anc_data[0] = err;

		anc_data[0] = err;

		anc_data[1] = msg_data_sz(msg);

		anc_data[1] = msg_data_sz(msg);

		if ((res = put_cmsg(m, SOL_SOCKET, TIPC_ERRINFO, 8, anc_data)))

		if ((res = put_cmsg(m, SOL_TIPC, TIPC_ERRINFO, 8, anc_data)))

			return res;

			return res;

		if (anc_data[1] &&

		if (anc_data[1] &&

		    (res = put_cmsg(m, SOL_SOCKET, TIPC_RETDATA, anc_data[1], 

		    (res = put_cmsg(m, SOL_TIPC, TIPC_RETDATA, anc_data[1], 

				    msg_data(msg))))

				    msg_data(msg))))

			return res;

			return res;

	}

	}
@@ -778,7 +778,7 @@ static int anc_data_recv(struct msghdr *m, struct tipc_msg *msg, 
		has_name = 0;

		has_name = 0;

	}

	}

	if (has_name &&

	if (has_name &&

	    (res = put_cmsg(m, SOL_SOCKET, TIPC_DESTNAME, 12, anc_data)))

	    (res = put_cmsg(m, SOL_TIPC, TIPC_DESTNAME, 12, anc_data)))

		return res;

		return res;





	return 0;

	return 0;