Commit e5b5ef7d authored by Dmitry Mishin's avatar Dmitry Mishin Committed by David S. Miller

[NETFILTER]: compat offsets size change

Used by compat code offsets of entries should be 'unsigned int' as entries
array size has this dimension.
Signed-off-by: default avatarDmitry Mishin <dim@openvz.org>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 63ea998a
...@@ -919,13 +919,13 @@ copy_entries_to_user(unsigned int total_size, ...@@ -919,13 +919,13 @@ copy_entries_to_user(unsigned int total_size,
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
struct compat_delta { struct compat_delta {
struct compat_delta *next; struct compat_delta *next;
u_int16_t offset; unsigned int offset;
short delta; short delta;
}; };
static struct compat_delta *compat_offsets = NULL; static struct compat_delta *compat_offsets = NULL;
static int compat_add_offset(u_int16_t offset, short delta) static int compat_add_offset(unsigned int offset, short delta)
{ {
struct compat_delta *tmp; struct compat_delta *tmp;
...@@ -957,7 +957,7 @@ static void compat_flush_offsets(void) ...@@ -957,7 +957,7 @@ static void compat_flush_offsets(void)
} }
} }
static short compat_calc_jump(u_int16_t offset) static short compat_calc_jump(unsigned int offset)
{ {
struct compat_delta *tmp; struct compat_delta *tmp;
short delta; short delta;
...@@ -997,7 +997,7 @@ static int compat_calc_entry(struct ipt_entry *e, struct xt_table_info *info, ...@@ -997,7 +997,7 @@ static int compat_calc_entry(struct ipt_entry *e, struct xt_table_info *info,
void *base, struct xt_table_info *newinfo) void *base, struct xt_table_info *newinfo)
{ {
struct ipt_entry_target *t; struct ipt_entry_target *t;
u_int16_t entry_offset; unsigned int entry_offset;
int off, i, ret; int off, i, ret;
off = 0; off = 0;
...@@ -1467,7 +1467,7 @@ check_compat_entry_size_and_hooks(struct ipt_entry *e, ...@@ -1467,7 +1467,7 @@ check_compat_entry_size_and_hooks(struct ipt_entry *e,
{ {
struct ipt_entry_target *t; struct ipt_entry_target *t;
struct ipt_target *target; struct ipt_target *target;
u_int16_t entry_offset; unsigned int entry_offset;
int ret, off, h, j; int ret, off, h, j;
duprintf("check_compat_entry_size_and_hooks %p\n", e); duprintf("check_compat_entry_size_and_hooks %p\n", e);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment