linux-stable.git/net/tipc/socket.c, branch v5.13.2

Revert "net:tipc: Fix a double free in tipc_sk_mcast_rcv"

2021-05-14T22:01:58+00:00

This reverts commit 6bf24dc0cc0cc43b29ba344b66d78590e687e046.
Above fix is not correct and caused memory leak issue.

Fixes: 6bf24dc0cc0c ("net:tipc: Fix a double free in tipc_sk_mcast_rcv")
Acked-by: Jon Maloy 
Acked-by: Tung Nguyen 
Signed-off-by: Hoang Le 
Signed-off-by: David S. Miller

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2021-04-10T03:48:35+00:00

Conflicts:

MAINTAINERS
 - keep Chandrasekar
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
 - simple fix + trust the code re-added to param.c in -next is fine
include/linux/bpf.h
 - trivial
include/linux/ethtool.h
 - trivial, fix kdoc while at it
include/linux/skmsg.h
 - move to relevant place in tcp.c, comment re-wrapped
net/core/skmsg.c
 - add the sk = sk // sk = NULL around calls
net/tipc/crypto.c
 - trivial

Signed-off-by: Jakub Kicinski

tipc: fix htmldoc and smatch warnings

2021-03-29T23:28:50+00:00

We fix a warning from the htmldoc tool and an indentation error reported
by smatch. There are no functional changes in this commit.

Signed-off-by: Jon Maloy 
Signed-off-by: David S. Miller

net:tipc: Fix a double free in tipc_sk_mcast_rcv

2021-03-29T23:21:37+00:00

In the if(skb_peek(arrvq) == skb) branch, it calls __skb_dequeue(arrvq) to get
the skb by skb = skb_peek(arrvq). Then __skb_dequeue() unlinks the skb from arrvq
and returns the skb which equals to skb_peek(arrvq). After __skb_dequeue(arrvq)
finished, the skb is freed by kfree_skb(__skb_dequeue(arrvq)) in the first time.

Unfortunately, the same skb is freed in the second time by kfree_skb(skb) after
the branch completed.

My patch removes kfree_skb() in the if(skb_peek(arrvq) == skb) branch, because
this skb will be freed by kfree_skb(skb) finally.

Fixes: cb1b728096f54 ("tipc: eliminate race condition at multicast reception")
Signed-off-by: Lv Yunlong 
Signed-off-by: David S. Miller

tipc: simplify signature of tipc_find_service()

2021-03-17T18:51:05+00:00

We reduce the signature of tipc_find_service() and
tipc_create_service(). The reason for doing this might not
be obvious, but we plan to let struct tipc_uaddr contain
information that is relevant for these functions in a later
commit.

Signed-off-by: Jon Maloy 
Acked-by: Ying Xue 
Acked-by: Hoang Le 
Acked-by: Tung Nguyen 
Acked-by: Xin Long 
Signed-off-by: David S. Miller

tipc: simplify signature of tipc_nametbl_lookup_group()

2021-03-17T18:51:04+00:00

We reduce the signature of tipc_nametbl_lookup_group() by using a
struct tipc_uaddr pointer. This entails a couple of minor changes in the
functions tipc_send_group_mcast/anycast/unicast/bcast() in socket.c

Signed-off-by: Jon Maloy 
Acked-by: Ying Xue 
Acked-by: Hoang Le 
Acked-by: Tung Nguyen 
Acked-by: Xin Long 
Signed-off-by: David S. Miller

tipc: simplify signature of tipc_nametbl_lookup_mcast_nodes()

2021-03-17T18:51:04+00:00

We follow up the preceding commits by reducing the signature of
the function tipc_nametbl_lookup_mcast_nodes().

Signed-off-by: Jon Maloy 
Acked-by: Ying Xue 
Acked-by: Hoang Le 
Acked-by: Tung Nguyen 
Acked-by: Xin Long 
Signed-off-by: David S. Miller

tipc: simplify signature of tipc_namtbl_lookup_mcast_sockets()

2021-03-17T18:51:04+00:00

We reduce the signature of this function according to the same
principle as the preceding commits.

Signed-off-by: Jon Maloy 
Acked-by: Ying Xue 
Acked-by: Hoang Le 
Acked-by: Tung Nguyen 
Acked-by: Xin Long 
Signed-off-by: David S. Miller

tipc: refactor tipc_sendmsg() and tipc_lookup_anycast()

2021-03-17T18:51:04+00:00

We simplify the signature if function tipc_nametbl_lookup_anycast(),
using address structures instead of discrete integers.

This also makes it possible to make some improvements to the functions
__tipc_sendmsg() in socket.c and tipc_msg_lookup_dest() in msg.c.

Signed-off-by: Jon Maloy 
Acked-by: Ying Xue 
Acked-by: Hoang Le 
Acked-by: Tung Nguyen 
Acked-by: Xin Long 
Signed-off-by: David S. Miller

tipc: rename binding table lookup functions

2021-03-17T18:51:04+00:00

The binding table provides four different lookup functions, which
purpose is not obvious neither by their names nor by the (lack of)
descriptions.

We now give these functions names that better match their purposes,
and improve the comments that describe what they are doing.

Signed-off-by: Jon Maloy 
Acked-by: Ying Xue 
Acked-by: Hoang Le 
Acked-by: Tung Nguyen 
Acked-by: Xin Long 
Signed-off-by: David S. Miller