amt: fix several bugs in gateway mode
Subsystems (3)
Taehee Yoo
maintainerv3 cover amt: fix several bugs in gateway mode
This patchset fixes bugs in amt module.
First patch fixes amt gateway mode's status stuck.
amt gateway and relay established so these two mode manage status. But gateway stuck to change its own status if a relay doesn't send responses.
Second patch fixes a memory leak.
amt gateway skips some handling of advertisement message. So, a memory leak would occur.
v3:
- Update git log message.
- Do not increase rx_dropped stats twice.
v2:
- Separate patch.
- Add patch cover-letter.
Taehee Yoo (2):
amt: fix gateway mode stuck
amt: fix memory leak for advertisement message
drivers/net/amt.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
Signature · 1 line
2.17.1
Taehee Yoo
maintainerPATCH v3 1/2 amt: fix gateway mode stuck
If a gateway can not receive any response to requests from a relay, gateway resets status from SENT_REQUEST to INIT and variable about a relay as well. And then it should start the full establish step from sending a discovery message and receiving advertisement message. But, after failure in amt_req_work() it continues sending a request message step with flushed(invalid) relay information and sets SENT_REQUEST. So, a gateway can't be established with a relay.
In order to avoid this situation, it stops sending the request message step if it fails.
---
v3:
- No changed.
v2:
- Separate patch.
drivers/net/amt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/amt.c +4 -2
@@ -943,7 +943,7 @@ static void amt_req_work(struct work_struct *work)if (amt->status <AMT_STATUS_RECEIVED_ADVERTISEMENT ) goto out; -if (amt->req_cnt++ >AMT_MAX_REQ_COUNT ) { +if (amt->req_cnt >AMT_MAX_REQ_COUNT ) {netdev_dbg (amt->dev,"Gateway is not ready" ); amt->qi =AMT_INIT_REQ_TIMEOUT ; amt->ready4 = false;
@@ -951,13 +951,15 @@ static void amt_req_work(struct work_struct *work) amt->remote_ip =0 ;__amt_update_gw_status (amt,AMT_STATUS_INIT , false); amt->req_cnt =0 ; + goto out; }spin_unlock_bh (&amt->lock);amt_send_request (amt, false);amt_send_request (amt, true); -amt_update_gw_status (amt,AMT_STATUS_SENT_REQUEST , true);spin_lock_bh (&amt->lock); +__amt_update_gw_status (amt,AMT_STATUS_SENT_REQUEST , true); + amt->req_cnt++; out: exp =min_t (u32, (1 * (1 << amt->req_cnt)),AMT_MAX_REQ_TIMEOUT );mod_delayed_work (amt_wq, &amt->req_wq,msecs_to_jiffies (exp *1000 ));
Signature · 1 line
2.17.1
Taehee Yoo
maintainerPATCH v3 2/2 amt: fix memory leak for advertisement message
In reply to Taehee YooWhen a gateway receives an advertisement message, it extracts relay information and then it should be freed.
But the advertisement handler doesn't free it.
So, memory leak would occur.
---
v3:
- Update git log message.
- Do not increase rx_dropped stats twice.
v2:
- Separate patch.
drivers/net/amt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/net/amt.c +2 -3
@@ -2698,9 +2698,8 @@ static int amt_rcv(struct sock *sk, struct sk_buff *skb) err = true; goto drop; } -if (amt_advertisement_handler (amt, skb)) - amt->dev->stats.rx_dropped++; - goto out; + err =amt_advertisement_handler (amt, skb); +break ;case AMT_MSG_MULTICAST_DATA :if (iph->saddr != amt->remote_ip) {netdev_dbg (amt->dev,"Invalid Relay IP\n" );
Signature · 1 line
2.17.1
This series was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Thu, 19 May 2022 03:15:53 +0000 you wrote:
This patchset fixes bugs in amt module.
First patch fixes amt gateway mode's status stuck.
amt gateway and relay established so these two mode manage status. But gateway stuck to change its own status if a relay doesn't send responses.[...]
Here is the summary with links:
- [net,v3,1/2] amt: fix gateway mode stuck
https://git.kernel.org/netdev/net/c/937956ba404e - [net,v3,2/2] amt: fix memory leak for advertisement message https://git.kernel.org/netdev/net/c/fe29794c3585
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html