patch-2.4.9 linux/net/ax25/af_ax25.c

• Lines: 18
• Date: Wed Aug 15 01:22:17 2001
• Orig file: v2.4.8/linux/net/ax25/af_ax25.c
• Orig date: Thu Apr 12 12:11:39 2001

diff -u --recursive --new-file v2.4.8/linux/net/ax25/af_ax25.c linux/net/ax25/af_ax25.c
@@ -751,7 +751,7 @@
 		return -EFAULT;
 
 	valptr = (void *) &val;
-	length = min(maxlen, sizeof(int));
+	length = min(unsigned int, maxlen, sizeof(int));
 
 	switch (optname) {
 		case AX25_WINDOW:
@@ -803,7 +803,7 @@
 
 			if (ax25_dev != NULL && ax25_dev->dev != NULL) {
 				strncpy(devname, ax25_dev->dev->name, IFNAMSIZ);
-				length = min(strlen(ax25_dev->dev->name)+1, maxlen);
+				length = min(unsigned int, strlen(ax25_dev->dev->name)+1, maxlen);
 				devname[length-1] = '\0';
 			} else {
 				*devname = '\0';