| Message ID | 20210705131321.217111-1-mudongliangabcd@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | ieee802154: hwsim: fix GPF in hwsim_set_edge_lqi | expand |
Hi, On Mon, 5 Jul 2021 at 09:13, Dongliang Mu <mudongliangabcd@gmail.com> wrote: > > Both MAC802154_HWSIM_ATTR_RADIO_ID and MAC802154_HWSIM_ATTR_RADIO_EDGE, > MAC802154_HWSIM_EDGE_ATTR_ENDPOINT_ID and MAC802154_HWSIM_EDGE_ATTR_LQI > must be present to fix GPF. > > Fixes: f25da51fdc38 ("ieee802154: hwsim: add replacement for fakelb") > Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com> Acked-by: Alexander Aring <aahringo@redhat.com> Thanks, but there are more places than this one. Can you send patches for them as well? Thanks! :) - Alex
On Wed, Jul 7, 2021 at 9:44 PM Alexander Aring <alex.aring@gmail.com> wrote: > > Hi, > > On Mon, 5 Jul 2021 at 09:13, Dongliang Mu <mudongliangabcd@gmail.com> wrote: > > > > Both MAC802154_HWSIM_ATTR_RADIO_ID and MAC802154_HWSIM_ATTR_RADIO_EDGE, > > MAC802154_HWSIM_EDGE_ATTR_ENDPOINT_ID and MAC802154_HWSIM_EDGE_ATTR_LQI > > must be present to fix GPF. > > > > Fixes: f25da51fdc38 ("ieee802154: hwsim: add replacement for fakelb") > > Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com> > > Acked-by: Alexander Aring <aahringo@redhat.com> > > Thanks, but there are more places than this one. Can you send patches > for them as well? Thanks! :) Sure. I will double-check those places and send patches to fix them. > > - Alex
Hello. On 07.07.21 16:40, Dongliang Mu wrote: > On Wed, Jul 7, 2021 at 9:44 PM Alexander Aring <alex.aring@gmail.com> wrote: >> >> Hi, >> >> On Mon, 5 Jul 2021 at 09:13, Dongliang Mu <mudongliangabcd@gmail.com> wrote: >>> >>> Both MAC802154_HWSIM_ATTR_RADIO_ID and MAC802154_HWSIM_ATTR_RADIO_EDGE, >>> MAC802154_HWSIM_EDGE_ATTR_ENDPOINT_ID and MAC802154_HWSIM_EDGE_ATTR_LQI >>> must be present to fix GPF. >>> >>> Fixes: f25da51fdc38 ("ieee802154: hwsim: add replacement for fakelb") >>> Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com> >> >> Acked-by: Alexander Aring <aahringo@redhat.com> >> >> Thanks, but there are more places than this one. Can you send patches >> for them as well? Thanks! :) > > Sure. I will double-check those places and send patches to fix them. I will take this one in as-is. All new patches should be done with this one applied. regards Stefan Schmidt
On Wed, Jul 7, 2021 at 10:41 PM Stefan Schmidt <stefan@datenfreihafen.org> wrote: > > Hello. > > On 07.07.21 16:40, Dongliang Mu wrote: > > On Wed, Jul 7, 2021 at 9:44 PM Alexander Aring <alex.aring@gmail.com> wrote: > >> > >> Hi, > >> > >> On Mon, 5 Jul 2021 at 09:13, Dongliang Mu <mudongliangabcd@gmail.com> wrote: > >>> > >>> Both MAC802154_HWSIM_ATTR_RADIO_ID and MAC802154_HWSIM_ATTR_RADIO_EDGE, > >>> MAC802154_HWSIM_EDGE_ATTR_ENDPOINT_ID and MAC802154_HWSIM_EDGE_ATTR_LQI > >>> must be present to fix GPF. > >>> > >>> Fixes: f25da51fdc38 ("ieee802154: hwsim: add replacement for fakelb") > >>> Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com> > >> > >> Acked-by: Alexander Aring <aahringo@redhat.com> > >> > >> Thanks, but there are more places than this one. Can you send patches > >> for them as well? Thanks! :) > > > > Sure. I will double-check those places and send patches to fix them. > > I will take this one in as-is. All new patches should be done with this > one applied. Sure. Thanks for your reminder. > > regards > Stefan Schmidt
Hello. On 07.07.21 15:44, Alexander Aring wrote: > Hi, > > On Mon, 5 Jul 2021 at 09:13, Dongliang Mu <mudongliangabcd@gmail.com> wrote: >> >> Both MAC802154_HWSIM_ATTR_RADIO_ID and MAC802154_HWSIM_ATTR_RADIO_EDGE, >> MAC802154_HWSIM_EDGE_ATTR_ENDPOINT_ID and MAC802154_HWSIM_EDGE_ATTR_LQI >> must be present to fix GPF. >> >> Fixes: f25da51fdc38 ("ieee802154: hwsim: add replacement for fakelb") >> Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com> > > Acked-by: Alexander Aring <aahringo@redhat.com> This patch has been applied to the wpan tree and will be part of the next pull request to net. Thanks! regards Stefan Schmidt
diff --git a/drivers/net/ieee802154/mac802154_hwsim.c b/drivers/net/ieee802154/mac802154_hwsim.c index ebc976b7fcc2..cae52bfb871e 100644 --- a/drivers/net/ieee802154/mac802154_hwsim.c +++ b/drivers/net/ieee802154/mac802154_hwsim.c @@ -528,14 +528,14 @@ static int hwsim_set_edge_lqi(struct sk_buff *msg, struct genl_info *info) u32 v0, v1; u8 lqi; - 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; if (nla_parse_nested_deprecated(edge_attrs, MAC802154_HWSIM_EDGE_ATTR_MAX, info->attrs[MAC802154_HWSIM_ATTR_RADIO_EDGE], hwsim_edge_policy, NULL)) return -EINVAL; - if (!edge_attrs[MAC802154_HWSIM_EDGE_ATTR_ENDPOINT_ID] && + if (!edge_attrs[MAC802154_HWSIM_EDGE_ATTR_ENDPOINT_ID] || !edge_attrs[MAC802154_HWSIM_EDGE_ATTR_LQI]) return -EINVAL;
Both MAC802154_HWSIM_ATTR_RADIO_ID and MAC802154_HWSIM_ATTR_RADIO_EDGE, MAC802154_HWSIM_EDGE_ATTR_ENDPOINT_ID and MAC802154_HWSIM_EDGE_ATTR_LQI must be present to fix GPF. Fixes: f25da51fdc38 ("ieee802154: hwsim: add replacement for fakelb") Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com> --- drivers/net/ieee802154/mac802154_hwsim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)