Commit 41b97ab5 authored by Dominik Brodowski's avatar Dominik Brodowski

pcmcia: fix ioport size calculation in rsrc_nonstatic

Size needs to be calculated after manipulating with the start value.
Reported-by: default avatarKomuro <komurojun-mbn@nifty.com>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent b1095afe
...@@ -810,7 +810,7 @@ static int adjust_memory(struct pcmcia_socket *s, unsigned int action, unsigned ...@@ -810,7 +810,7 @@ static int adjust_memory(struct pcmcia_socket *s, unsigned int action, unsigned
static int adjust_io(struct pcmcia_socket *s, unsigned int action, unsigned long start, unsigned long end) static int adjust_io(struct pcmcia_socket *s, unsigned int action, unsigned long start, unsigned long end)
{ {
struct socket_data *data = s->resource_data; struct socket_data *data = s->resource_data;
unsigned long size = end - start + 1; unsigned long size;
int ret = 0; int ret = 0;
#if defined(CONFIG_X86) #if defined(CONFIG_X86)
...@@ -820,6 +820,8 @@ static int adjust_io(struct pcmcia_socket *s, unsigned int action, unsigned long ...@@ -820,6 +820,8 @@ static int adjust_io(struct pcmcia_socket *s, unsigned int action, unsigned long
start = 0x100; start = 0x100;
#endif #endif
size = end - start + 1;
if (end < start) if (end < start)
return -EINVAL; return -EINVAL;
......
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