Commit b38a4bd3 authored Dec 10, 2014 by Alan Cox Committed by Greg Kroah-Hartman Jan 12, 2015

pcmcia cis: on an out of range CIS read return 0xff, don't just warn



The current code displays warnings but then proceeds to try and reference
the data through the PCMCIA window. Instead return 0xff. This prevents bogus
CIS data sending us off into hyperspace.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent a6c6193a

drivers/pcmcia/cistpl.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -168,9 +168,12 @@ int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr, u_int addr,
		} else {
		u_int inc = 1, card_offset, flags;

		if (addr > CISTPL_MAX_CIS_SIZE)
		if (addr > CISTPL_MAX_CIS_SIZE) {
		dev_dbg(&s->dev,
		"attempt to read CIS mem at addr %#x", addr);
		memset(ptr, 0xff, len);
		return -1;
		}

		flags = MAP_ACTIVE \| ((cis_width) ? MAP_16BIT : 0);
		if (attr) {

Admin message