svn commit: r367273 - head/lib/libnetmap

[Adrian Chadd]

Author: adrian
Date: Mon Nov  2 15:01:37 2020
New Revision: 367273
URL: https://svnweb.freebsd.org/changeset/base/367273

Log:
  [libnetmap] Fix 32 bit compilation under gcc-6.4
  
  Use uintptr_t to cast a uint64_t to a pointer type.
  Yeah, it isn't technically correct for platforms with pointers
  > 64 bits, but it's fine here.
  
  This fixes 32 bit compat library builds on amd64 and also
  mips32 builds.
  
  Reviewed by:	imp
  Differential Revision:	https://reviews.freebsd.org/D26790

Modified:
  head/lib/libnetmap/nmreq.c

Modified: head/lib/libnetmap/nmreq.c
==============================================================================
--- head/lib/libnetmap/nmreq.c	Mon Nov  2 14:30:55 2020	(r367272)
+++ head/lib/libnetmap/nmreq.c	Mon Nov  2 15:01:37 2020	(r367273)
@@ -603,10 +603,9 @@ nmreq_options_decode(const char *opt, struct nmreq_opt
 struct nmreq_option *
 nmreq_find_option(struct nmreq_header *h, uint32_t t)
 {
-	struct nmreq_option *o;
+	struct nmreq_option *o = NULL;
 
-	for (o = (struct nmreq_option *)h->nr_options; o != NULL;
-			o = (struct nmreq_option *)o->nro_next) {
+	nmreq_foreach_option(h, o) {
 		if (o->nro_reqtype == t)
 			break;
 	}
@@ -633,8 +632,14 @@ nmreq_free_options(struct nmreq_header *h)
 {
 	struct nmreq_option *o, *next;
 
-	for (o = (struct nmreq_option *)h->nr_options; o != NULL; o = next) {
-		next = (struct nmreq_option *)o->nro_next;
+	/*
+	 * Note: can't use nmreq_foreach_option() here; it frees the
+	 * list as it's walking and nmreq_foreach_option() isn't
+	 * modification-safe.
+	 */
+	for (o = (struct nmreq_option *)(uintptr_t)h->nr_options; o != NULL;
+	    o = next) {
+		next = (struct nmreq_option *)(uintptr_t)o->nro_next;
 		free(o);
 	}
 }