changeset 19391:ef54683bed44

12154 loader: readudp() does convert pointers with different alignment (missed sizeof struct ip) Reviewed by: Matthias Scheler <mscheler@tintri.com> Approved by: Dan McDonald <danmcd@joyent.com>
author Toomas Soome <tsoome@me.com>
date Sun, 05 Jan 2020 15:24:11 +0200
parents 72be09e58904
children 4f1738442338
files usr/src/boot/Makefile.version usr/src/boot/lib/libstand/udp.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/boot/Makefile.version	Tue Jan 14 22:45:10 2020 +0200
+++ b/usr/src/boot/Makefile.version	Sun Jan 05 15:24:11 2020 +0200
@@ -33,4 +33,4 @@
 # Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes.
 # The version is processed from left to right, the version number can only
 # be increased.
-BOOT_VERSION = $(LOADER_VERSION)-2020.01.16.2
+BOOT_VERSION = $(LOADER_VERSION)-2020.01.17.1
--- a/usr/src/boot/lib/libstand/udp.c	Tue Jan 14 22:45:10 2020 +0200
+++ b/usr/src/boot/lib/libstand/udp.c	Sun Jan 05 15:24:11 2020 +0200
@@ -141,7 +141,7 @@
 		void *ip;
 		struct ip tip;
 
-		n = ntohs(uh->uh_ulen) + sizeof (*ip);
+		n = ntohs(uh->uh_ulen) + sizeof (struct ip);
 
 		/*
 		 * Check checksum (must save and restore ip header).