2016-02-26 08:06:07

by Alexander Aring

Subject: [PATCH bluetooth-next] 6lowpan: iphc: fix invalid case handling

This patch fixes the return value in a case which should never occur.
Instead returning "-EINVAL" we return LOWPAN_IPHC_DAM_00 which is
invalid on context based addresses. Also change the WARN_ON_ONCE to
WARN_ONCE which was suggested by Dan Carpenter.

Reported-by: Dan Carpenter <[email protected]>
Signed-off-by: Alexander Aring <[email protected]>
---
net/6lowpan/iphc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/6lowpan/iphc.c b/net/6lowpan/iphc.c
index 06287ac..7217251 100644
--- a/net/6lowpan/iphc.c
+++ b/net/6lowpan/iphc.c
@@ -811,8 +811,8 @@ static u8 lowpan_compress_ctx_addr(u8 **hc_ptr, const struct in6_addr *ipaddr,
goto out;
}

- WARN_ON_ONCE("context found but no address mode matched\n");
- return -EINVAL;
+ WARN_ONCE(1, "context found but no address mode matched\n");
+ return LOWPAN_IPHC_DAM_00;
out:

if (sam)
--
2.7.1

2016-02-26 08:12:14

by Marcel Holtmann

Subject: Re: [PATCH bluetooth-next] 6lowpan: iphc: fix invalid case handling

Hi Alex,

> This patch fixes the return value in a case which should never occur.
> Instead returning "-EINVAL" we return LOWPAN_IPHC_DAM_00 which is
> invalid on context based addresses. Also change the WARN_ON_ONCE to
> WARN_ONCE which was suggested by Dan Carpenter.
>
> Reported-by: Dan Carpenter <[email protected]>
> Signed-off-by: Alexander Aring <[email protected]>
> ---
> net/6lowpan/iphc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel