Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5251aea authored by John W. Linville's avatar John W. Linville
Browse files

wavelan: avoid index past end of array if DEBUG_SHOW_UNUSED is defined 

Reported by Daniel Marjamäki <danielm77@spray.se> here:

	http://bugzilla.kernel.org/show_bug.cgi?id=10588



Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent bb55bdd5

drivers/net/wireless/wavelan.c

+2 −2
Original line number Diff line number Diff line
@@ -908,9 +908,9 @@ static void wv_psa_show(psa_t * p) 
	     p->psa_call_code[3], p->psa_call_code[4], p->psa_call_code[5],

	     p->psa_call_code[6], p->psa_call_code[7]);

#ifdef DEBUG_SHOW_UNUSED

	printk(KERN_DEBUG "psa_reserved[]: %02X:%02X:%02X:%02X\n",

	printk(KERN_DEBUG "psa_reserved[]: %02X:%02X\n",

	       p->psa_reserved[0],

	       p->psa_reserved[1], p->psa_reserved[2], p->psa_reserved[3]);

	       p->psa_reserved[1]);

#endif				/* DEBUG_SHOW_UNUSED */

	printk(KERN_DEBUG "psa_conf_status: %d, ", p->psa_conf_status);

	printk("psa_crc: 0x%02x%02x, ", p->psa_crc[0], p->psa_crc[1]);

drivers/net/wireless/wavelan_cs.c

+2 −4
Original line number Diff line number Diff line
@@ -1074,11 +1074,9 @@ wv_psa_show(psa_t * p) 
	 p->psa_call_code[6],

	 p->psa_call_code[7]);

#ifdef DEBUG_SHOW_UNUSED

  printk(KERN_DEBUG "psa_reserved[]: %02X:%02X:%02X:%02X\n",

  printk(KERN_DEBUG "psa_reserved[]: %02X:%02X\n",

	 p->psa_reserved[0],

	 p->psa_reserved[1],

	 p->psa_reserved[2],

	 p->psa_reserved[3]);

	 p->psa_reserved[1]);

#endif	/* DEBUG_SHOW_UNUSED */

  printk(KERN_DEBUG "psa_conf_status: %d, ", p->psa_conf_status);

  printk("psa_crc: 0x%02x%02x, ", p->psa_crc[0], p->psa_crc[1]);