| From 28b00b65d66394244df447115705562ba32f2030 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 21 Jun 2021 11:02:44 -0700 |
| Subject: ieee802154: hwsim: avoid possible crash in hwsim_del_edge_nl() |
| |
| From: Eric Dumazet <edumazet@google.com> |
| |
| [ Upstream commit 0303b30375dff5351a79cc2c3c87dfa4fda29bed ] |
| |
| Both MAC802154_HWSIM_ATTR_RADIO_ID and MAC802154_HWSIM_ATTR_RADIO_EDGE |
| must be present to avoid a crash. |
| |
| Fixes: f25da51fdc38 ("ieee802154: hwsim: add replacement for fakelb") |
| Signed-off-by: Eric Dumazet <edumazet@google.com> |
| Cc: Alexander Aring <alex.aring@gmail.com> |
| Cc: Stefan Schmidt <stefan@datenfreihafen.org> |
| Reported-by: syzbot <syzkaller@googlegroups.com> |
| Acked-by: Alexander Aring <aahringo@redhat.com> |
| Link: https://lore.kernel.org/r/20210621180244.882076-1-eric.dumazet@gmail.com |
| Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ieee802154/mac802154_hwsim.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ieee802154/mac802154_hwsim.c b/drivers/net/ieee802154/mac802154_hwsim.c |
| index 6d479df2d9e5..626e1ce817fc 100644 |
| --- a/drivers/net/ieee802154/mac802154_hwsim.c |
| +++ b/drivers/net/ieee802154/mac802154_hwsim.c |
| @@ -480,7 +480,7 @@ static int hwsim_del_edge_nl(struct sk_buff *msg, struct genl_info *info) |
| struct hwsim_edge *e; |
| u32 v0, v1; |
| |
| - if (!info->attrs[MAC802154_HWSIM_ATTR_RADIO_ID] && |
| + if (!info->attrs[MAC802154_HWSIM_ATTR_RADIO_ID] || |
| !info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE]) |
| return -EINVAL; |
| |
| -- |
| 2.30.2 |
| |