Re: [PATCH net] ieee802154: fix logic error in ieee802154_llsec_parse_dev_addr

[Stefan Schmidt]

Hello.

On 26/05/16 15:07, Baozeng Ding wrote:

Fix a logic error to avoid potential null pointer dereference.

Signed-off-by: Baozeng Ding<splovi...@gmail.com>
---
  net/ieee802154/nl802154.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index ca207db..116187b 100644
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -1289,8 +1289,8 @@ ieee802154_llsec_parse_dev_addr(struct nlattr *nla,
                                     nl802154_dev_addr_policy))
                return -EINVAL;

- if (!attrs[NL802154_DEV_ADDR_ATTR_PAN_ID] &&

-           !attrs[NL802154_DEV_ADDR_ATTR_MODE] &&
+       if (!attrs[NL802154_DEV_ADDR_ATTR_PAN_ID] ||
+           !attrs[NL802154_DEV_ADDR_ATTR_MODE] ||
            !(attrs[NL802154_DEV_ADDR_ATTR_SHORT] ||
              attrs[NL802154_DEV_ADDR_ATTR_EXTENDED]))
                return -EINVAL;

Good catch!

Reviewed-by: Stefan Schmidt<ste...@osg.samsung.com>

regards
Stefan Schmidt