Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755737Ab2JPSSG (ORCPT ); Tue, 16 Oct 2012 14:18:06 -0400 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:51325 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755193Ab2JPSSE (ORCPT ); Tue, 16 Oct 2012 14:18:04 -0400 Date: Tue, 16 Oct 2012 19:17:42 +0100 From: Will Deacon To: Aaro Koskinen Cc: "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "rmk+kernel@arm.linux.org.uk" Subject: Re: [PATCH] ARM: kexec: fix segment memory addresses check Message-ID: <20121016181742.GO23979@mudshark.cambridge.arm.com> References: <1350410244-12240-1-git-send-email-aaro.koskinen@iki.fi> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1350410244-12240-1-git-send-email-aaro.koskinen@iki.fi> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1504 Lines: 43 On Tue, Oct 16, 2012 at 06:57:24PM +0100, Aaro Koskinen wrote: > Commit c564df4db85aac8d1d65a56176a0a25f46138064 (ARM: 7540/1: kexec: > Check segment memory addresses) added a safety check with accidentally > reversed condition, and broke kexec functionality on ARM. Fix this. > > Signed-off-by: Aaro Koskinen > --- > arch/arm/kernel/machine_kexec.c | 7 +++---- > 1 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c > index e29c333..8ef8c93 100644 > --- a/arch/arm/kernel/machine_kexec.c > +++ b/arch/arm/kernel/machine_kexec.c > @@ -45,10 +45,9 @@ int machine_kexec_prepare(struct kimage *image) > for (i = 0; i < image->nr_segments; i++) { > current_segment = &image->segment[i]; > > - err = memblock_is_region_memory(current_segment->mem, > - current_segment->memsz); > - if (err) > - return - EINVAL; > + if (!memblock_is_region_memory(current_segment->mem, > + current_segment->memsz)) > + return -EINVAL; > > err = get_user(header, (__be32*)current_segment->buf); > if (err) > -- > 1.7.2.5 Thanks for this Aaro: Acked-by: Will Deacon Please stick it in the patch system. Will -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/