svn commit: r298731 - head/sys/compat/ndis

Pedro F. Giffuni pfg at FreeBSD.org
Thu Apr 28 01:58:58 UTC 2016


Author: pfg
Date: Thu Apr 28 01:58:56 2016
New Revision: 298731
URL: https://svnweb.freebsd.org/changeset/base/298731

Log:
  ndis(4): unsign some indexes to prevent overflows.
  
  The "len" parameter is uint32_t, indexing it with an int may
  end up in a signed integer overflow.
  
  strlen(3) returns an integer of size_t so the corresponding index should
  have that size.
  
  MFC after:	1 week

Modified:
  head/sys/compat/ndis/subr_ndis.c

Modified: head/sys/compat/ndis/subr_ndis.c
==============================================================================
--- head/sys/compat/ndis/subr_ndis.c	Thu Apr 28 01:43:18 2016	(r298730)
+++ head/sys/compat/ndis/subr_ndis.c	Thu Apr 28 01:58:56 2016	(r298731)
@@ -896,7 +896,7 @@ NdisReadPciSlotInformation(adapter, slot
 	uint32_t		len;
 {
 	ndis_miniport_block	*block;
-	int			i;
+	uint32_t		i;
 	char			*dest;
 	device_t		dev;
 
@@ -939,7 +939,7 @@ NdisWritePciSlotInformation(adapter, slo
 	uint32_t		len;
 {
 	ndis_miniport_block	*block;
-	int			i;
+	uint32_t		i;
 	char			*dest;
 	device_t		dev;
 
@@ -2432,7 +2432,7 @@ NdisReadPcmciaAttributeMemory(handle, of
 	bus_space_handle_t	bh;
 	bus_space_tag_t		bt;
 	char			*dest;
-	int			i;
+	uint32_t		i;
 
 	if (handle == NULL)
 		return (0);
@@ -2462,7 +2462,7 @@ NdisWritePcmciaAttributeMemory(handle, o
 	bus_space_handle_t	bh;
 	bus_space_tag_t		bt;
 	char			*src;
-	int			i;
+	uint32_t		i;
 
 	if (handle == NULL)
 		return (0);
@@ -2670,7 +2670,7 @@ ndis_find_sym(lf, filename, suffix, sym)
 {
 	char			*fullsym;
 	char			*suf;
-	int			i;
+	size_t			i;
 
 	fullsym = ExAllocatePoolWithTag(NonPagedPool, MAXPATHLEN, 0);
 	if (fullsym == NULL)


More information about the svn-src-all mailing list