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

Commit 7a8036c2 authored by Allan Stephens's avatar Allan Stephens Committed by David S. Miller
Browse files

[TIPC]: Ignore message padding when receiving stream data 



This patch ensures that padding bytes appearing at the end of
an incoming TIPC message are not returned as valid stream data.

Signed-off-by: default avatarAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a198d3a2

net/tipc/socket.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1027,7 +1027,7 @@ restart: 




	if (!err) {

	if (!err) {

		buf_crs = (unsigned char *)(TIPC_SKB_CB(buf)->handle);

		buf_crs = (unsigned char *)(TIPC_SKB_CB(buf)->handle);

		sz = skb_tail_pointer(buf) - buf_crs;

		sz = (unsigned char *)msg + msg_size(msg) - buf_crs;





		needed = (buf_len - sz_copied);

		needed = (buf_len - sz_copied);

		sz_to_copy = (sz <= needed) ? sz : needed;

		sz_to_copy = (sz <= needed) ? sz : needed;