Skip to content

Commit 56077b5

Browse files
lxindavem330
authored andcommitted
tipc: do not update mtu if msg_max is too small in mtu negotiation
When doing link mtu negotiation, a malicious peer may send Activate msg with a very small mtu, e.g. 4 in Shuang's testing, without checking for the minimum mtu, l->mtu will be set to 4 in tipc_link_proto_rcv(), then n->links[bearer_id].mtu is set to 4294967228, which is a overflow of '4 - INT_H_SIZE - EMSG_OVERHEAD' in tipc_link_mss(). With tipc_link.mtu = 4, tipc_link_xmit() kept printing the warning: tipc: Too large msg, purging xmit list 1 5 0 40 4! tipc: Too large msg, purging xmit list 1 15 0 60 4! And with tipc_link_entry.mtu 4294967228, a huge skb was allocated in named_distribute(), and when purging it in tipc_link_xmit(), a crash was even caused: general protection fault, probably for non-canonical address 0x2100001011000dd: 0000 [#1] PREEMPT SMP PTI CPU: 0 PID: 0 Comm: swapper/0 Kdump: loaded Not tainted 6.3.0.neta #19 RIP: 0010:kfree_skb_list_reason+0x7e/0x1f0 Call Trace: <IRQ> skb_release_data+0xf9/0x1d0 kfree_skb_reason+0x40/0x100 tipc_link_xmit+0x57a/0x740 [tipc] tipc_node_xmit+0x16c/0x5c0 [tipc] tipc_named_node_up+0x27f/0x2c0 [tipc] tipc_node_write_unlock+0x149/0x170 [tipc] tipc_rcv+0x608/0x740 [tipc] tipc_udp_recv+0xdc/0x1f0 [tipc] udp_queue_rcv_one_skb+0x33e/0x620 udp_unicast_rcv_skb.isra.72+0x75/0x90 __udp4_lib_rcv+0x56d/0xc20 ip_protocol_deliver_rcu+0x100/0x2d0 This patch fixes it by checking the new mtu against tipc_bearer_min_mtu(), and not updating mtu if it is too small. Fixes: ed193ec ("tipc: simplify link mtu negotiation") Reported-by: Shuang Li <shuali@redhat.com> Signed-off-by: Xin Long <lucien.xin@gmail.com> Acked-by: Jon Maloy <jmaloy@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 3ae6d66 commit 56077b5

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

net/tipc/link.c

+6-3
Original file line numberDiff line numberDiff line change
@@ -2200,7 +2200,7 @@ static int tipc_link_proto_rcv(struct tipc_link *l, struct sk_buff *skb,
22002200
struct tipc_msg *hdr = buf_msg(skb);
22012201
struct tipc_gap_ack_blks *ga = NULL;
22022202
bool reply = msg_probe(hdr), retransmitted = false;
2203-
u32 dlen = msg_data_sz(hdr), glen = 0;
2203+
u32 dlen = msg_data_sz(hdr), glen = 0, msg_max;
22042204
u16 peers_snd_nxt = msg_next_sent(hdr);
22052205
u16 peers_tol = msg_link_tolerance(hdr);
22062206
u16 peers_prio = msg_linkprio(hdr);
@@ -2239,6 +2239,9 @@ static int tipc_link_proto_rcv(struct tipc_link *l, struct sk_buff *skb,
22392239
switch (mtyp) {
22402240
case RESET_MSG:
22412241
case ACTIVATE_MSG:
2242+
msg_max = msg_max_pkt(hdr);
2243+
if (msg_max < tipc_bearer_min_mtu(l->net, l->bearer_id))
2244+
break;
22422245
/* Complete own link name with peer's interface name */
22432246
if_name = strrchr(l->name, ':') + 1;
22442247
if (sizeof(l->name) - (if_name - l->name) <= TIPC_MAX_IF_NAME)
@@ -2283,8 +2286,8 @@ static int tipc_link_proto_rcv(struct tipc_link *l, struct sk_buff *skb,
22832286
l->peer_session = msg_session(hdr);
22842287
l->in_session = true;
22852288
l->peer_bearer_id = msg_bearer_id(hdr);
2286-
if (l->mtu > msg_max_pkt(hdr))
2287-
l->mtu = msg_max_pkt(hdr);
2289+
if (l->mtu > msg_max)
2290+
l->mtu = msg_max;
22882291
break;
22892292

22902293
case STATE_MSG:

0 commit comments

Comments
 (0)