From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Fri, 4 May 2012 20:06:50 +0000 (+0200)
Subject: Fix invalid assignment to const void pointer
X-Git-Tag: v6.12.1~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9dcf6937ede801effaf64f03470fa838246278b;p=ipset

Fix invalid assignment to const void pointer

gcc 4.7 and above ignore such assignments which leads to a broken
ipset binary (bug reported by Seblu).
---

diff --git a/lib/session.c b/lib/session.c
index 01a2413..6700ea1 100644
--- a/lib/session.c
+++ b/lib/session.c
@@ -1464,21 +1464,21 @@ rawdata2attr(struct ipset_session *session, struct nlmsghdr *nlh,
 		return 1;
 
 	switch (attr->type) {
-	case MNL_TYPE_NUL_STRING:
-		alen = strlen((const char *)d) + 1;
-		break;
 	case MNL_TYPE_U32: {
 		uint32_t value = htonl(*(const uint32_t *)d);
 
-		d = &value;
-		break;
+		mnl_attr_put(nlh, type | flags, alen, &value);
+		return 0;
 	}
 	case MNL_TYPE_U16: {
 		uint16_t value = htons(*(const uint16_t *)d);
 
-		d = &value;
-		break;
+		mnl_attr_put(nlh, type | flags, alen, &value);
+		return 0;
 	}
+	case MNL_TYPE_NUL_STRING:
+		alen = strlen((const char *)d) + 1;
+		break;
 	default:
 		break;
 	}