From: Alexander Aring <alex.aring@gmail.com>
To: linux-zigbee-devel@lists.sourceforge.net
Cc: werner@almesberger.net, linux-bluetooth@vger.kernel.org,
Alexander Aring <alex.aring@gmail.com>
Subject: [PATCH v2 bluetooth-next 1/7] 6lowpan: fix udp nullpointer dereferencing
Date: Tue, 17 Dec 2013 11:32:47 +0100 [thread overview]
Message-ID: <1387276373-23882-2-git-send-email-alex.aring@gmail.com> (raw)
In-Reply-To: <1387276373-23882-1-git-send-email-alex.aring@gmail.com>
Sometimes a nullpointer dereferencing occurs because of using a wrong
pointer arithmetic in udp_uncompression.
This patch changes "**(hc06_ptr + 3)" to the right one "*(*hc06_ptr +
3)". Dereferencing like "**(hc06_ptr + 3)" works in a random case only.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
net/ieee802154/6lowpan_iphc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net/ieee802154/6lowpan_iphc.c b/net/ieee802154/6lowpan_iphc.c
index 88e7da5..8bbe28e 100644
--- a/net/ieee802154/6lowpan_iphc.c
+++ b/net/ieee802154/6lowpan_iphc.c
@@ -548,7 +548,7 @@ static void compress_udp_header(u8 **hc06_ptr, struct sk_buff *skb)
LOWPAN_NHC_UDP_4BIT_PORT)) {
pr_debug("UDP header: both ports compression to 4 bits\n");
**hc06_ptr = LOWPAN_NHC_UDP_CS_P_11;
- **(hc06_ptr + 1) = /* subtraction is faster */
+ *(*hc06_ptr + 1) = /* subtraction is faster */
(u8)((uh->dest - LOWPAN_NHC_UDP_4BIT_PORT) +
((uh->source & LOWPAN_NHC_UDP_4BIT_PORT) << 4));
*hc06_ptr += 2;
@@ -557,14 +557,14 @@ static void compress_udp_header(u8 **hc06_ptr, struct sk_buff *skb)
pr_debug("UDP header: remove 8 bits of dest\n");
**hc06_ptr = LOWPAN_NHC_UDP_CS_P_01;
memcpy(*hc06_ptr + 1, &uh->source, 2);
- **(hc06_ptr + 3) = (u8)(uh->dest - LOWPAN_NHC_UDP_8BIT_PORT);
+ *(*hc06_ptr + 3) = (u8)(uh->dest - LOWPAN_NHC_UDP_8BIT_PORT);
*hc06_ptr += 4;
} else if ((uh->source & LOWPAN_NHC_UDP_8BIT_MASK) ==
LOWPAN_NHC_UDP_8BIT_PORT) {
pr_debug("UDP header: remove 8 bits of source\n");
**hc06_ptr = LOWPAN_NHC_UDP_CS_P_10;
memcpy(*hc06_ptr + 1, &uh->dest, 2);
- **(hc06_ptr + 3) = (u8)(uh->source - LOWPAN_NHC_UDP_8BIT_PORT);
+ *(*hc06_ptr + 3) = (u8)(uh->source - LOWPAN_NHC_UDP_8BIT_PORT);
*hc06_ptr += 4;
} else {
pr_debug("UDP header: can't compress\n");
--
1.8.5.1
next prev parent reply other threads:[~2013-12-17 10:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-17 10:32 [PATCH v2 bluetooth-next 0/7] 6lowpan: udp compression/uncompression fix Alexander Aring
2013-12-17 10:32 ` Alexander Aring [this message]
2013-12-17 10:58 ` [PATCH v2 bluetooth-next 1/7] 6lowpan: fix udp nullpointer dereferencing Anderson Lizardo
2013-12-17 11:06 ` Alexander Aring
2013-12-17 11:25 ` Alexander Aring
2013-12-17 10:32 ` [PATCH v2 bluetooth-next 2/7] 6lowpan: fix udp compress ordering Alexander Aring
2013-12-17 10:32 ` [PATCH v2 bluetooth-next 3/7] 6lowpan: fix udp byte ordering Alexander Aring
2013-12-17 10:32 ` [PATCH v2 bluetooth-next 4/7] 6lowpan: add udp warning for elided checksum Alexander Aring
2013-12-17 10:32 ` [PATCH v2 bluetooth-next 5/7] 6lowpan: udp use lowpan_fetch_skb function Alexander Aring
2013-12-17 10:32 ` [PATCH v2 bluetooth-next 6/7] 6lowpan: udp use subtraction on both conditions Alexander Aring
2013-12-17 10:32 ` [PATCH v2 bluetooth-next 7/7] 6lowpan: cleanup udp compress function Alexander Aring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1387276373-23882-2-git-send-email-alex.aring@gmail.com \
--to=alex.aring@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-zigbee-devel@lists.sourceforge.net \
--cc=werner@almesberger.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.