Commit 2d656145 authored by Matthieu Castet's avatar Matthieu Castet Committed by Linus Torvalds

[PATCH] pnpbios parser bugfix

this patch fix a pnpbios problem with independant
resource(http://bugzilla.kernel.org/show_bug.cgi?id=3295) :
the old code assume that they are given at the beggining (before any
SMALL_TAG_STARTDEP entry), but in some case there are found after
SMALL_TAG_ENDDEP entry.

tag : 6 SMALL_TAG_STARTDEP
tag : 8 SMALL_TAG_PORT
tag : 6 SMALL_TAG_STARTDEP
tag : 8 SMALL_TAG_PORT
tag : 7 SMALL_TAG_ENDDEP
tag : 4 SMALL_TAG_IRQ   <-- independant resource
tag : f SMALL_TAG_END
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9e1e1f7d
...@@ -346,12 +346,12 @@ pnpbios_parse_resource_option_data(unsigned char * p, unsigned char * end, struc ...@@ -346,12 +346,12 @@ pnpbios_parse_resource_option_data(unsigned char * p, unsigned char * end, struc
{ {
unsigned int len, tag; unsigned int len, tag;
int priority = 0; int priority = 0;
struct pnp_option *option; struct pnp_option *option, *option_independent;
if (!p) if (!p)
return NULL; return NULL;
option = pnp_register_independent_option(dev); option_independent = option = pnp_register_independent_option(dev);
if (!option) if (!option)
return NULL; return NULL;
...@@ -428,9 +428,14 @@ pnpbios_parse_resource_option_data(unsigned char * p, unsigned char * end, struc ...@@ -428,9 +428,14 @@ pnpbios_parse_resource_option_data(unsigned char * p, unsigned char * end, struc
case SMALL_TAG_ENDDEP: case SMALL_TAG_ENDDEP:
if (len != 0) if (len != 0)
goto len_err; goto len_err;
if (option_independent == option)
printk(KERN_WARNING "PnPBIOS: Missing SMALL_TAG_STARTDEP tag\n");
option = option_independent;
break; break;
case SMALL_TAG_END: case SMALL_TAG_END:
if (option_independent != option)
printk(KERN_WARNING "PnPBIOS: Missing SMALL_TAG_ENDDEP tag\n");
p = p + 2; p = p + 2;
return (unsigned char *)p; return (unsigned char *)p;
break; break;
......
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