aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaehee Yoo <ap420073@gmail.com>2022-07-17 16:09:07 +0000
committerPaolo Abeni <pabeni@redhat.com>2022-07-19 12:37:02 +0200
commit40185f359fbabaa61da754cc29d12f3a41e0a987 (patch)
tree920ca83069e757cee32832c996ed9c9da43d6e54
parent627f16931bf3cb20d50274d9341380ac2c3035fd (diff)
downloadlinux-40185f359fbabaa61da754cc29d12f3a41e0a987.tar.gz
amt: drop unexpected advertisement message
AMT gateway interface should not receive unexpected advertisement messages. In order to drop these packets, it should check nonce and amt->status. Fixes: cbc21dc1cfe9 ("amt: add data plane of amt interface") Signed-off-by: Taehee Yoo <ap420073@gmail.com> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-rw-r--r--drivers/net/amt.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/amt.c b/drivers/net/amt.c
index e0743c20b78067..2d007c5c546362 100644
--- a/drivers/net/amt.c
+++ b/drivers/net/amt.c
@@ -2260,6 +2260,10 @@ static bool amt_advertisement_handler(struct amt_dev *amt, struct sk_buff *skb)
ipv4_is_zeronet(amta->ip4))
return true;
+ if (amt->status != AMT_STATUS_SENT_DISCOVERY ||
+ amt->nonce != amta->nonce)
+ return true;
+
amt->remote_ip = amta->ip4;
netdev_dbg(amt->dev, "advertised remote ip = %pI4\n", &amt->remote_ip);
mod_delayed_work(amt_wq, &amt->req_wq, 0);
@@ -2975,6 +2979,7 @@ static int amt_dev_open(struct net_device *dev)
amt->req_cnt = 0;
amt->remote_ip = 0;
+ amt->nonce = 0;
get_random_bytes(&amt->key, sizeof(siphash_key_t));
amt->status = AMT_STATUS_INIT;