linux-kernel - linux-next: manual merge of the bluetooth tree with the net/net-next trees

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20140107125418.986ae20298ddc55e5e657447@canb.auug.org.au>
Date:	Tue, 7 Jan 2014 12:54:18 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Gustavo Padovan <gustavo@...ovan.org>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Daniel Borkmann <dborkman@...hat.com>,
	Jukka Rissanen <jukka.rissanen@...ux.intel.com>
Subject: linux-next: manual merge of the bluetooth tree with the
 net/net-next trees

Hi Gustavo,

Today's linux-next merge of the bluetooth tree got a conflict in
net/ieee802154/6lowpan.c between commit 965801e1eb62 ("net: 6lowpan: fix
lowpan_header_create non-compression memcpy call") from the  tree and
commit 8df8c56a5abc ("6lowpan: Moving generic compression code into
6lowpan_iphc.c") from the bluetooth tree.

I fixed it up (I applied the following patch to move the fix into
6lowpan_iphc.c) and can carry the fix as necessary (no action is
required).

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Tue, 7 Jan 2014 12:52:43 +1100
Subject: [PATCH] net: 6lowpan: fixup for code movement

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 net/ieee802154/6lowpan_iphc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ieee802154/6lowpan_iphc.c b/net/ieee802154/6lowpan_iphc.c
index 11840f9e46da..e14fe8b2c054 100644
--- a/net/ieee802154/6lowpan_iphc.c
+++ b/net/ieee802154/6lowpan_iphc.c
@@ -677,7 +677,7 @@ int lowpan_header_compress(struct sk_buff *skb, struct net_device *dev,
 			hc06_ptr += 3;
 		} else {
 			/* compress nothing */
-			memcpy(hc06_ptr, &hdr, 4);
+			memcpy(hc06_ptr, hdr, 4);
 			/* replace the top byte with new ECN | DSCP format */
 			*hc06_ptr = tmp;
 			hc06_ptr += 4;
-- 
1.8.5.2

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped