linux-kernel - linux-next: manual merge of the wireless-next tree with the net-next tree

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]

Date:	Fri, 13 Apr 2012 12:41:03 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"John W. Linville" <linville@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Samuel Ortiz <sameo@...ux.intel.com>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Subject: linux-next: manual merge of the wireless-next tree with the
 net-next tree

Hi John,

Today's linux-next merge of the wireless-next tree got a semantic
conflict in net/nfc/netlink.c between commit b3fe91c53a0a ("netlink:
Delete all NLA_PUT*() macros") from the net-next tree and commit
8112a5c91d78 ("NFC: Add a target lost netlink event") from the
wireless-next tree.

I added the below merge fix patch.

From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Fri, 13 Apr 2012 12:34:10 +1000
Subject: [PATCH] NFC: fix up for NLA_PUT_ api changes

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 net/nfc/netlink.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index 539d041..24d8d12 100644
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -202,8 +202,10 @@ int nfc_genl_target_lost(struct nfc_dev *dev, u32 target_idx)
 	if (!hdr)
 		goto free_msg;
 
-	NLA_PUT_STRING(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev));
-	NLA_PUT_U32(msg, NFC_ATTR_TARGET_INDEX, target_idx);
+	if (nla_put_string(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev)))
+		goto nla_put_failure;
+	if (nla_put_u32((msg, NFC_ATTR_TARGET_INDEX, target_idx))
+		goto nla_put_failure;
 
 	genlmsg_end(msg, hdr);
 
-- 
1.7.10.rc3

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

Content of type "application/pgp-signature" skipped