⬢ DragonFlyBSD Kernel Audit
DF-5696 / fix.diff
← back to finding ↓ download raw 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
--- a/sys/libkern/qsort.c
+++ b/sys/libkern/qsort.c
@@ -38,7 +38,7 @@
 typedef int		cmp_t(const void *, const void *);
 #endif
 static __inline char	*med3(char *, char *, char *, cmp_t *, void *);
-static __inline void	 swapfunc(char *, char *, int, int);
+static __inline void	 swapfunc(char *, char *, size_t, int);
 
 #define min(a, b)	(a) < (b) ? (a) : (b)
 
@@ -60,7 +60,7 @@
 	es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
 
 static __inline void
-swapfunc(char *a, char *b, int n, int swaptype)
+swapfunc(char *a, char *b, size_t n, int swaptype)
 {
 	if(swaptype <= 1)
 		swapcode(long, a, b, n)
@@ -106,7 +106,8 @@
 #endif
 {
 	char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
-	int d, r, swaptype, swap_cnt;
+	int r, swaptype, swap_cnt;
+	size_t d, r2;
 
 loop:	SWAPINIT(a, es);
 	swap_cnt = 0;
@@ -166,20 +167,20 @@
 	}
 
 	pn = (char *)a + n * es;
-	r = min(pa - (char *)a, pb - pa);
-	vecswap(a, pb - r, r);
-	r = min(pd - pc, pn - pd - es);
-	vecswap(pb, pn - r, r);
-	if ((r = pb - pa) > es)
+	r2 = min(pa - (char *)a, pb - pa);
+	vecswap(a, pb - r2, r2);
+	r2 = min(pd - pc, pn - pd - es);
+	vecswap(pb, pn - r2, r2);
+	if ((r2 = pb - pa) > es)
 #ifdef	I_AM_KQSORT_R
-		kqsort_r(a, r / es, es, thunk, cmp);
+		kqsort_r(a, r2 / es, es, thunk, cmp);
 #else
-		kqsort(a, r / es, es, cmp);
+		kqsort(a, r2 / es, es, cmp);
 #endif
-	if ((r = pd - pc) > es) {
+	if ((r2 = pd - pc) > es) {
 		/* Iterate rather than recurse to save stack space */
-		a = pn - r;
-		n = r / es;
+		a = pn - r2;
+		n = r2 / es;
 		goto loop;
 	}
 }