浏览代码

pcmcia: do not try to store more than 4 version strings

... for struct pcmcia_device only provides for 4 anyway.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Dominik Brodowski 15 年之前
父节点
当前提交
c5e09528be
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      drivers/pcmcia/ds.c

+ 1 - 1
drivers/pcmcia/ds.c

@@ -583,7 +583,7 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev)
 
 
 	if (!pccard_read_tuple(p_dev->socket, BIND_FN_ALL, CISTPL_VERS_1,
 	if (!pccard_read_tuple(p_dev->socket, BIND_FN_ALL, CISTPL_VERS_1,
 			       vers1)) {
 			       vers1)) {
-		for (i=0; i < vers1->ns; i++) {
+		for (i = 0; i < min_t(unsigned int, 4, vers1->ns); i++) {
 			char *tmp;
 			char *tmp;
 			unsigned int length;
 			unsigned int length;