mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
bitmap: fix nbits signess
To avoid potentially dangerous sign conversions in bitmap_switch, all the callers of the bitmap_switch macro (which are all within bitmap.h) should pass an unsigned int as first parameter. Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com> Acked-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
1 parent
25dc15db92
commit
5704923f94
1 file changed
+12
-12
+12
-12
@@ -110,7 +110,7 @@ extern int bitmap_allocate_region(unsigned long *bitmap, int pos, int order);
|
|||||||
large; \
|
large; \
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void bitmap_zero(unsigned long *dst, int nbits)
|
static inline void bitmap_zero(unsigned long *dst, unsigned int nbits)
|
||||||
{
|
{
|
||||||
bitmap_switch(nbits,,
|
bitmap_switch(nbits,,
|
||||||
*dst = 0UL,
|
*dst = 0UL,
|
||||||
@@ -134,7 +134,7 @@ static inline void bitmap_fill(unsigned long *dst, int nbits)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static inline void bitmap_copy(unsigned long *dst, const unsigned long *src,
|
static inline void bitmap_copy(unsigned long *dst, const unsigned long *src,
|
||||||
int nbits)
|
unsigned int nbits)
|
||||||
{
|
{
|
||||||
bitmap_switch(nbits,,
|
bitmap_switch(nbits,,
|
||||||
*dst = *src,
|
*dst = *src,
|
||||||
@@ -142,7 +142,7 @@ static inline void bitmap_copy(unsigned long *dst, const unsigned long *src,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static inline void bitmap_and(unsigned long *dst, const unsigned long *src1,
|
static inline void bitmap_and(unsigned long *dst, const unsigned long *src1,
|
||||||
const unsigned long *src2, int nbits)
|
const unsigned long *src2, unsigned int nbits)
|
||||||
{
|
{
|
||||||
bitmap_switch(nbits,,
|
bitmap_switch(nbits,,
|
||||||
*dst = *src1 & *src2,
|
*dst = *src1 & *src2,
|
||||||
@@ -150,7 +150,7 @@ static inline void bitmap_and(unsigned long *dst, const unsigned long *src1,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static inline void bitmap_or(unsigned long *dst, const unsigned long *src1,
|
static inline void bitmap_or(unsigned long *dst, const unsigned long *src1,
|
||||||
const unsigned long *src2, int nbits)
|
const unsigned long *src2, unsigned int nbits)
|
||||||
{
|
{
|
||||||
bitmap_switch(nbits,,
|
bitmap_switch(nbits,,
|
||||||
*dst = *src1 | *src2,
|
*dst = *src1 | *src2,
|
||||||
@@ -158,7 +158,7 @@ static inline void bitmap_or(unsigned long *dst, const unsigned long *src1,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static inline void bitmap_xor(unsigned long *dst, const unsigned long *src1,
|
static inline void bitmap_xor(unsigned long *dst, const unsigned long *src1,
|
||||||
const unsigned long *src2, int nbits)
|
const unsigned long *src2, unsigned int nbits)
|
||||||
{
|
{
|
||||||
bitmap_switch(nbits,,
|
bitmap_switch(nbits,,
|
||||||
*dst = *src1 ^ *src2,
|
*dst = *src1 ^ *src2,
|
||||||
@@ -166,7 +166,7 @@ static inline void bitmap_xor(unsigned long *dst, const unsigned long *src1,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static inline void bitmap_andnot(unsigned long *dst, const unsigned long *src1,
|
static inline void bitmap_andnot(unsigned long *dst, const unsigned long *src1,
|
||||||
const unsigned long *src2, int nbits)
|
const unsigned long *src2, unsigned int nbits)
|
||||||
{
|
{
|
||||||
bitmap_switch(nbits,,
|
bitmap_switch(nbits,,
|
||||||
*dst = *src1 & ~*src2,
|
*dst = *src1 & ~*src2,
|
||||||
@@ -174,7 +174,7 @@ static inline void bitmap_andnot(unsigned long *dst, const unsigned long *src1,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static inline void bitmap_complement(unsigned long *dst, const unsigned long *src,
|
static inline void bitmap_complement(unsigned long *dst, const unsigned long *src,
|
||||||
int nbits)
|
unsigned int nbits)
|
||||||
{
|
{
|
||||||
bitmap_switch(nbits,,
|
bitmap_switch(nbits,,
|
||||||
*dst = ~*src & BITMAP_LAST_WORD_MASK(nbits),
|
*dst = ~*src & BITMAP_LAST_WORD_MASK(nbits),
|
||||||
@@ -182,7 +182,7 @@ static inline void bitmap_complement(unsigned long *dst, const unsigned long *sr
|
|||||||
}
|
}
|
||||||
|
|
||||||
static inline int bitmap_equal(const unsigned long *src1,
|
static inline int bitmap_equal(const unsigned long *src1,
|
||||||
const unsigned long *src2, int nbits)
|
const unsigned long *src2, unsigned int nbits)
|
||||||
{
|
{
|
||||||
bitmap_switch(nbits,
|
bitmap_switch(nbits,
|
||||||
return -1,
|
return -1,
|
||||||
@@ -191,7 +191,7 @@ static inline int bitmap_equal(const unsigned long *src1,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static inline int bitmap_intersects(const unsigned long *src1,
|
static inline int bitmap_intersects(const unsigned long *src1,
|
||||||
const unsigned long *src2, int nbits)
|
const unsigned long *src2, unsigned int nbits)
|
||||||
{
|
{
|
||||||
bitmap_switch(nbits,
|
bitmap_switch(nbits,
|
||||||
return -1,
|
return -1,
|
||||||
@@ -200,7 +200,7 @@ static inline int bitmap_intersects(const unsigned long *src1,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static inline int bitmap_subset(const unsigned long *src1,
|
static inline int bitmap_subset(const unsigned long *src1,
|
||||||
const unsigned long *src2, int nbits)
|
const unsigned long *src2, unsigned int nbits)
|
||||||
{
|
{
|
||||||
bitmap_switch(nbits,
|
bitmap_switch(nbits,
|
||||||
return -1,
|
return -1,
|
||||||
@@ -208,7 +208,7 @@ static inline int bitmap_subset(const unsigned long *src1,
|
|||||||
return __bitmap_subset(src1, src2, nbits));
|
return __bitmap_subset(src1, src2, nbits));
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int bitmap_empty(const unsigned long *src, int nbits)
|
static inline int bitmap_empty(const unsigned long *src, unsigned int nbits)
|
||||||
{
|
{
|
||||||
bitmap_switch(nbits,
|
bitmap_switch(nbits,
|
||||||
return -1,
|
return -1,
|
||||||
@@ -216,7 +216,7 @@ static inline int bitmap_empty(const unsigned long *src, int nbits)
|
|||||||
return __bitmap_empty(src, nbits));
|
return __bitmap_empty(src, nbits));
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int bitmap_full(const unsigned long *src, int nbits)
|
static inline int bitmap_full(const unsigned long *src, unsigned int nbits)
|
||||||
{
|
{
|
||||||
bitmap_switch(nbits,
|
bitmap_switch(nbits,
|
||||||
return -1,
|
return -1,
|
||||||
|
|||||||