From patchwork Tue Nov 3 19:49:18 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: roel kluin X-Patchwork-Id: 37527 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5D67EB7BA9 for ; Wed, 4 Nov 2009 06:40:21 +1100 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1N5PCl-0006ys-99; Tue, 03 Nov 2009 19:38:11 +0000 Received: from mail-ew0-f228.google.com ([209.85.219.228]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1N5PCf-0006xd-5W for linux-mtd@lists.infradead.org; Tue, 03 Nov 2009 19:38:09 +0000 Received: by ewy28 with SMTP id 28so6348053ewy.18 for ; Tue, 03 Nov 2009 11:38:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:content-type :content-transfer-encoding; bh=lJ2AiFnjedWvQeGiWGUjtXWPNUsdSGEHNuN4d7dCVVk=; b=ZADNb7S7lMYQoj0A8uykGysUGfvYyi1aRK81qB9oKbTQI6KnxUkCPpeBGk3S4d6IVF ja3BgkpGcLlhQMmQSzrUNNjBiLlnFLz9XevOGnLAIHk1LTUkcnWsaRttHwXx6W9mKTdE 3pGl1ZqMXmeKz9ifb11cIpVpcJtdGGpNb2+Vc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; b=UaEyeCmb/KICXteFFUGvquQq642eeRgnEPGqnRMgERai6JwD1B0CUZ4yc+YqorUldG WIEjnUE7jj1Q3LFXyHcufJiCcXunQ+EWg1Nd88qvtsMZIdZT2rQp+Ro8uwh7rPW9EoM4 /u6X+ySj6e9Pytrwnp5soE3PPw/QTq+OA+eP0= Received: by 10.213.72.144 with SMTP id m16mr556488ebj.5.1257277082653; Tue, 03 Nov 2009 11:38:02 -0800 (PST) Received: from zoinx.mars (d133062.upc-d.chello.nl [213.46.133.62]) by mx.google.com with ESMTPS id 23sm1176758eya.20.2009.11.03.11.38.01 (version=SSLv3 cipher=RC4-MD5); Tue, 03 Nov 2009 11:38:02 -0800 (PST) Message-ID: <4AF0893E.8040101@gmail.com> Date: Tue, 03 Nov 2009 20:49:18 +0100 From: Roel Kluin User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.4pre) Gecko/20091014 Fedora/3.0-2.8.b4.fc11 Thunderbird/3.0b4 MIME-Version: 1.0 To: David Woodhouse , linux-mtd@lists.infradead.org, Andrew Morton , LKML Subject: [PATCH] UBI: Ensure index is positive X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20091103_143805_321572_99950559 X-CRM114-Status: GOOD ( 22.30 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.2.5 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- _SUMMARY_ X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The index is signed, make sure it is not negative when we read the array element. Signed-off-by: Roel Kluin --- drivers/mtd/mtdcore.c | 2 +- drivers/mtd/nand/fsl_upm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 467a4f1..c356c0a 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -447,7 +447,7 @@ struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num) for (i=0; i< MAX_MTD_DEVICES; i++) if (mtd_table[i] == mtd) ret = mtd_table[i]; - } else if (num < MAX_MTD_DEVICES) { + } else if (num >= 0 && num < MAX_MTD_DEVICES) { ret = mtd_table[num]; if (mtd && mtd != ret) ret = NULL; diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c index d120cd8..071a60c 100644 --- a/drivers/mtd/nand/fsl_upm.c +++ b/drivers/mtd/nand/fsl_upm.c @@ -112,7 +112,7 @@ static void fun_select_chip(struct mtd_info *mtd, int mchip_nr) if (mchip_nr == -1) { chip->cmd_ctrl(mtd, NAND_CMD_NONE, 0 | NAND_CTRL_CHANGE); - } else if (mchip_nr >= 0) { + } else if (mchip_nr >= 0 && mchip_nr < NAND_MAX_CHIPS) { fun->mchip_number = mchip_nr; chip->IO_ADDR_R = fun->io_base + fun->mchip_offsets[mchip_nr]; chip->IO_ADDR_W = chip->IO_ADDR_R;