From patchwork Sat Apr 29 22:40:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 13227112 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A53F3C77B7C for ; Sat, 29 Apr 2023 22:41:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230360AbjD2Wky (ORCPT ); Sat, 29 Apr 2023 18:40:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230255AbjD2Wkx (ORCPT ); Sat, 29 Apr 2023 18:40:53 -0400 Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6BC6E63 for ; Sat, 29 Apr 2023 15:40:51 -0700 (PDT) Received: by mail-qk1-x733.google.com with SMTP id af79cd13be357-74e4f839ae4so54822685a.0 for ; Sat, 29 Apr 2023 15:40:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682808050; x=1685400050; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JdC5vKdhMqXkGLWjKKDVL+KYo0HsVuHVLflZJjoZrwg=; b=YXiBSwfGnrtfIbs5qF5CTQZCtt9xbr1H0/JbmQC7BJEyQgcU99obGyojHy6JUp2R/u tBNgdD5zbZ3t9A1eWWGVXBu6w56O9yGDl9z34uuvDqDL1Low5RL99SGYpGrzhBMIvSe9 4pl7f0IbQZhgWRYVETUhG+YQ9WmKNQM8BL/pwl9IwyoKQLpWH/HF8bBfmB8L/ljPUv3R M8r/wsUrX0RR+IrlOf7fvgA8+TzybkYahUSxpsUnWah9AS3tYQujUd/BaWIjwQUMmzM0 5mXOPDfeTce6wi/AGzsCs3r5YiuaQ+eYbGF9hIm0fJfobmJM4Tgi26jLU+te/zq53uj6 LfVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682808050; x=1685400050; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JdC5vKdhMqXkGLWjKKDVL+KYo0HsVuHVLflZJjoZrwg=; b=LhH3oxmLoFBGxJvU6KfIgr2GyP0SxTx9UbquCob4xeqE3V8a4XEd62NrvWOJlTScUX ja8wF4mXk4rBGLieHEbDaw6AGrz3Eb/bpX0TQqoy6ZnyHbuFJigi3LO5QXYzGXeEQtL7 XPcCC1Dws7Fg45orrhUPo5DK6rRvHoIMNZxIoPmGEUNFdQ4hzUPlcFXDdldypxE8kLS5 z5MCrlmYRKZpvPw2Y3MvHI7QpNEnSXrAJJMn/KwhQ5Fnv906XvqzdxLrKuPhuVmniFY7 X/s5QngrEE3f8XdS0skIrLQGCu0lp2F664MY+zeRvTGRc3wW1QUBuc+9t1DCfmiM3D+V 3VJg== X-Gm-Message-State: AC+VfDzutdVnh6GvSiujYp4Fdtv6hyF+KnBb1t+m9JokssB3Ty+NZgmn XPBIIaTEZlxF3SbEc7EASXDxTc+NW2Vg3g== X-Google-Smtp-Source: ACHHUZ5ES7Qmaaz74zXkPwG8lwiiTYkbTaajv2hUYChCNJI1/CEhQS0y+j+h1RU63ImVUgro1yM7aw== X-Received: by 2002:a05:6214:c4d:b0:61a:9107:bac9 with SMTP id r13-20020a0562140c4d00b0061a9107bac9mr51189qvj.33.1682808050063; Sat, 29 Apr 2023 15:40:50 -0700 (PDT) Received: from wsfd-netdev15.ntdv.lab.eng.bos.redhat.com (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id p12-20020a0ce18c000000b00606322241b4sm6595741qvl.27.2023.04.29.15.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 15:40:49 -0700 (PDT) From: Xin Long To: network dev , tipc-discussion@lists.sourceforge.net Cc: davem@davemloft.net, kuba@kernel.org, Eric Dumazet , Paolo Abeni , Jon Maloy Subject: [PATCH net 1/2] tipc: add tipc_bearer_min_mtu to calculate min mtu Date: Sat, 29 Apr 2023 18:40:46 -0400 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org As different media may requires different min mtu, and even the same media with different net family requires different min mtu, add tipc_bearer_min_mtu() to calculate min mtu accordingly. This API will be used to check the new mtu when doing the link mtu negotiation in the next patch. Signed-off-by: Xin Long --- net/tipc/bearer.c | 13 +++++++++++++ net/tipc/bearer.h | 3 +++ net/tipc/udp_media.c | 5 +++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index 35cac7733fd3..c5d2e8c45f88 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c @@ -541,6 +541,19 @@ int tipc_bearer_mtu(struct net *net, u32 bearer_id) return mtu; } +int tipc_bearer_min_mtu(struct net *net, u32 bearer_id) +{ + int mtu = TIPC_MIN_BEARER_MTU; + struct tipc_bearer *b; + + rcu_read_lock(); + b = rcu_dereference(tipc_net(net)->bearer_list[bearer_id]); + if (b) + mtu += b->encap_hlen; + rcu_read_unlock(); + return mtu; +} + /* tipc_bearer_xmit_skb - sends buffer to destination over bearer */ void tipc_bearer_xmit_skb(struct net *net, u32 bearer_id, diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h index 490ad6e5f7a3..bd0cc5c287ef 100644 --- a/net/tipc/bearer.h +++ b/net/tipc/bearer.h @@ -146,6 +146,7 @@ struct tipc_media { * @identity: array index of this bearer within TIPC bearer array * @disc: ptr to link setup request * @net_plane: network plane ('A' through 'H') currently associated with bearer + * @encap_hlen: encap headers length * @up: bearer up flag (bit 0) * @refcnt: tipc_bearer reference counter * @@ -170,6 +171,7 @@ struct tipc_bearer { u32 identity; struct tipc_discoverer *disc; char net_plane; + u16 encap_hlen; unsigned long up; refcount_t refcnt; }; @@ -232,6 +234,7 @@ int tipc_bearer_setup(void); void tipc_bearer_cleanup(void); void tipc_bearer_stop(struct net *net); int tipc_bearer_mtu(struct net *net, u32 bearer_id); +int tipc_bearer_min_mtu(struct net *net, u32 bearer_id); bool tipc_bearer_bcast_support(struct net *net, u32 bearer_id); void tipc_bearer_xmit_skb(struct net *net, u32 bearer_id, struct sk_buff *skb, diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c index c2bb818704c8..0a85244fd618 100644 --- a/net/tipc/udp_media.c +++ b/net/tipc/udp_media.c @@ -738,8 +738,8 @@ static int tipc_udp_enable(struct net *net, struct tipc_bearer *b, udp_conf.local_ip.s_addr = local.ipv4.s_addr; udp_conf.use_udp_checksums = false; ub->ifindex = dev->ifindex; - if (tipc_mtu_bad(dev, sizeof(struct iphdr) + - sizeof(struct udphdr))) { + b->encap_hlen = sizeof(struct iphdr) + sizeof(struct udphdr); + if (tipc_mtu_bad(dev, b->encap_hlen)) { err = -EINVAL; goto err; } @@ -760,6 +760,7 @@ static int tipc_udp_enable(struct net *net, struct tipc_bearer *b, else udp_conf.local_ip6 = local.ipv6; ub->ifindex = dev->ifindex; + b->encap_hlen = sizeof(struct ipv6hdr) + sizeof(struct udphdr); b->mtu = 1280; #endif } else { From patchwork Sat Apr 29 22:40:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xin Long X-Patchwork-Id: 13227111 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B633EC77B7F for ; Sat, 29 Apr 2023 22:41:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230255AbjD2Wk4 (ORCPT ); Sat, 29 Apr 2023 18:40:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230353AbjD2Wkx (ORCPT ); Sat, 29 Apr 2023 18:40:53 -0400 Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39DE5E65 for ; Sat, 29 Apr 2023 15:40:52 -0700 (PDT) Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-7515631b965so233289285a.0 for ; Sat, 29 Apr 2023 15:40:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682808051; x=1685400051; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2qHWjQ5y7sdq1lEzMlodqYYV4HxL5KkG3T5QxP3eicA=; b=RHLmr9mR/NpruWH+WAfcTvM2/fglyG8IPXWSntfy7XNz3sETdrkZhktRiEQZSSt/sB eG9CfKJ8RVIRyfmSVIIhvPMNgS3TZ1rWZ9Np8bBkzhtrBurLkQAQ2fxHfPQRWLAMD8Ht DgG26i7DnhBlpKAGPTBPmEP9bXd3c84RbFVr3TnjgvkS8A1DZDulL+XbteLUXP+qWMyu DtOQ0IUV97TbejGKXwUbMiI27WuXTqj80FSlgVH2+hwB8QO9JdalopyVMYU9E53nVwxG 6A7HtjPnNvxtvvXkYj0NUgEmWB0TVMrwZOWOcJ5ojuPK/mwiM/lY67+wWim7AsGDsK9L eluw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682808051; x=1685400051; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2qHWjQ5y7sdq1lEzMlodqYYV4HxL5KkG3T5QxP3eicA=; b=V7Cd2mhZjNqHNo5UWZXEjUTWh4pJk9CclGZ0C33WItxj1fVsBvviNLAD6+4STOwmpb pMvJHhGqbFSByUmv9i9nrfb/ZtmnnsmuR+8mdK8BvevP1TQtXMB5C7zxsUyR4wpp9Dnk XVH5G3ugYc3tpwWGEw2hDQbpuXMGnzGH7lok5+QfT722h0ySYx0khbN51abn6LoCTnkU 4QYwbFYbr/4eNWddZ6tFoh4z6HdD8q+sbVCilKF/t5+2EApsunuXJxRUbLyu1v5rwGPp QUPaL2owXyYEUOhBtFj/UCotZLnuy75BXujyMFYzjRh/malKQIj5CqCWDOPlvszmHZoK 45/A== X-Gm-Message-State: AC+VfDz9tKo9PEHMmnOW/GVkFRW8iL/C/3PXTPCmlLfDRtmwHsZ4YW3y Zm07k6NkNwRO6BUe5zP2zfIDFP4ejK1oQg== X-Google-Smtp-Source: ACHHUZ5CAIr8mf2xf7QdnYmLVMDpGcglRjC1fgZI7nqHVq2ObmlyJF+howDznfuY3qxXnfTuR1OtOw== X-Received: by 2002:ad4:5bc8:0:b0:5ef:5481:595 with SMTP id t8-20020ad45bc8000000b005ef54810595mr23543601qvt.0.1682808050922; Sat, 29 Apr 2023 15:40:50 -0700 (PDT) Received: from wsfd-netdev15.ntdv.lab.eng.bos.redhat.com (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id p12-20020a0ce18c000000b00606322241b4sm6595741qvl.27.2023.04.29.15.40.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Apr 2023 15:40:50 -0700 (PDT) From: Xin Long To: network dev , tipc-discussion@lists.sourceforge.net Cc: davem@davemloft.net, kuba@kernel.org, Eric Dumazet , Paolo Abeni , Jon Maloy Subject: [PATCH net 2/2] tipc: do not update mtu if msg_max is too small Date: Sat, 29 Apr 2023 18:40:47 -0400 Message-Id: <22ba689983844705563c15c2f16e6381f2a0412c.1682807958.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org 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: 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: ed193ece2649 ("tipc: simplify link mtu negotiation") Reported-by: Shuang Li Signed-off-by: Xin Long --- net/tipc/link.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/tipc/link.c b/net/tipc/link.c index b3ce24823f50..a9e46c58b28a 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -2200,7 +2200,7 @@ static int tipc_link_proto_rcv(struct tipc_link *l, struct sk_buff *skb, struct tipc_msg *hdr = buf_msg(skb); struct tipc_gap_ack_blks *ga = NULL; bool reply = msg_probe(hdr), retransmitted = false; - u32 dlen = msg_data_sz(hdr), glen = 0; + u32 dlen = msg_data_sz(hdr), glen = 0, msg_max; u16 peers_snd_nxt = msg_next_sent(hdr); u16 peers_tol = msg_link_tolerance(hdr); u16 peers_prio = msg_linkprio(hdr); @@ -2283,8 +2283,9 @@ static int tipc_link_proto_rcv(struct tipc_link *l, struct sk_buff *skb, l->peer_session = msg_session(hdr); l->in_session = true; l->peer_bearer_id = msg_bearer_id(hdr); - if (l->mtu > msg_max_pkt(hdr)) - l->mtu = msg_max_pkt(hdr); + msg_max = msg_max_pkt(hdr); + if (msg_max >= tipc_bearer_min_mtu(l->net, l->bearer_id) && l->mtu > msg_max) + l->mtu = msg_max; break; case STATE_MSG: