From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759421AbdCVLpp (ORCPT ); Wed, 22 Mar 2017 07:45:45 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:42268 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758523AbdCVLpm (ORCPT ); Wed, 22 Mar 2017 07:45:42 -0400 Subject: Re: [PATCH] tpm2: fix off-by-one comparison and out-of-bounds read error To: Jarkko Sakkinen References: <20170320142336.10997-1-colin.king@canonical.com> <20170322114256.pdwg6buj2wkhcooy@intel.com> Cc: Peter Huewe , Marcel Selhorst , Jason Gunthorpe , tpmdd-devel@lists.sourceforge.net, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org From: Colin Ian King Message-ID: Date: Wed, 22 Mar 2017 11:45:37 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <20170322114256.pdwg6buj2wkhcooy@intel.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 22/03/17 11:42, Jarkko Sakkinen wrote: > On Mon, Mar 20, 2017 at 02:23:36PM +0000, Colin King wrote: >> From: Colin Ian King >> >> The comparison of an out of range index into space->context_tbl is >> off-by-one and should be using >= rather than > in the comparison. >> >> Detected by CoverityScan, CID#1419694 ("Out-of-bounds read") >> >> Fixes: 849246e7ce9ce ("tpm2: add session handle context saving and restoring to the space code") >> Signed-off-by: Colin Ian King >> --- >> drivers/char/tpm/tpm2-space.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/char/tpm/tpm2-space.c b/drivers/char/tpm/tpm2-space.c >> index d36d81e07076..009934269514 100644 >> --- a/drivers/char/tpm/tpm2-space.c >> +++ b/drivers/char/tpm/tpm2-space.c >> @@ -229,7 +229,7 @@ static bool tpm2_map_to_phandle(struct tpm_space *space, void *handle) >> int i; >> >> i = 0xFFFFFF - (vhandle & 0xFFFFFF); >> - if (i > ARRAY_SIZE(space->context_tbl) || !space->context_tbl[i]) >> + if (i >= ARRAY_SIZE(space->context_tbl) || !space->context_tbl[i]) >> return false; >> >> phandle = space->context_tbl[i]; >> -- >> 2.11.0 > > Thanks. If you don't mind, I would squash this to that patch? > > /Jarkko > Sure squash it, and maybe add a Reported-by: Colin Ian King if that's OK with you. Colin