Index: contrib/elftoolchain/libelf/libelf_convert.m4
===================================================================
--- contrib/elftoolchain/libelf/libelf_convert.m4
+++ contrib/elftoolchain/libelf/libelf_convert.m4
@@ -947,11 +947,6 @@
 		READ_WORD(src, descsz);
 		READ_WORD(src, type);
 
-		sz = namesz;
-		ROUNDUP2(sz, 4);
-		sz += descsz;
-		ROUNDUP2(sz, 4);
-
 		/* Translate. */
 		SWAP_WORD(namesz);
 		SWAP_WORD(descsz);
@@ -967,6 +962,11 @@
 		dst += sizeof(Elf_Note);
 		count -= hdrsz;
 
+		ROUNDUP2(namesz, 4);
+		ROUNDUP2(descsz, 4);
+
+		sz = namesz + descsz;
+
 		if (count < sz || dsz < sz)	/* Buffers are too small. */
 			return (0);
 
@@ -1005,6 +1005,11 @@
 		descsz = en->n_descsz;
 		type = en->n_type;
 
+		sz = namesz;
+		ROUNDUP2(sz, 4);
+		sz += descsz;
+		ROUNDUP2(sz, 4);
+
 		SWAP_WORD(namesz);
 		SWAP_WORD(descsz);
 		SWAP_WORD(type);
@@ -1015,11 +1020,6 @@
 
 		src += sizeof(Elf_Note);
 
-		ROUNDUP2(namesz, 4);
-		ROUNDUP2(descsz, 4);
-
-		sz = namesz + descsz;
-
 		if (count < sz)
 			sz = count;