All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dan Carpenter <dan.carpenter@oracle.com>
To: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>,
	x86@kernel.org, Matt Fleming <matt.fleming@intel.com>,
	Maarten Lankhorst <m.b.lankhorst@gmail.com>,
	linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] x86, efi: fix pointer math issue in handle_ramdisks()
Date: Fri, 02 Mar 2012 19:01:28 +0000	[thread overview]
Message-ID: <20120302190128.GC3951@elgon.mountain> (raw)

"filename" is a efi_char16_t string so this check for reaching the end
of the array doesn't work.  We need to cast it to char pointer before
doing the math.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index fec216f..cf4cdb7 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -559,7 +559,7 @@ static efi_status_t handle_ramdisks(efi_loaded_image_t *image,
 			str++;
 
 		while (*str && *str != ' ' && *str != '\n') {
-			if (p >= filename + sizeof(filename))
+			if ((char *)p >= (char *)filename + sizeof(filename))
 				break;
 
 			*p++ = *str++;

WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com>
To: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>,
	x86@kernel.org, Matt Fleming <matt.fleming@intel.com>,
	Maarten Lankhorst <m.b.lankhorst@gmail.com>,
	linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] x86, efi: fix pointer math issue in handle_ramdisks()
Date: Fri, 2 Mar 2012 22:01:28 +0300	[thread overview]
Message-ID: <20120302190128.GC3951@elgon.mountain> (raw)

"filename" is a efi_char16_t string so this check for reaching the end
of the array doesn't work.  We need to cast it to char pointer before
doing the math.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index fec216f..cf4cdb7 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -559,7 +559,7 @@ static efi_status_t handle_ramdisks(efi_loaded_image_t *image,
 			str++;
 
 		while (*str && *str != ' ' && *str != '\n') {
-			if (p >= filename + sizeof(filename))
+			if ((char *)p >= (char *)filename + sizeof(filename))
 				break;
 
 			*p++ = *str++;

             reply	other threads:[~2012-03-02 19:01 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-02 19:01 Dan Carpenter [this message]
2012-03-02 19:01 ` [patch] x86, efi: fix pointer math issue in handle_ramdisks() Dan Carpenter
2012-03-03  7:54 ` Ingo Molnar
2012-03-03  7:54   ` Ingo Molnar
2012-03-05 18:06   ` [patch v2] " Dan Carpenter
2012-03-05 18:06     ` Dan Carpenter
2012-03-05 18:42     ` walter harms
2012-03-05 18:42       ` walter harms
2012-03-05 19:33       ` H. Peter Anvin
2012-03-05 19:33         ` H. Peter Anvin
2012-03-06  8:44         ` walter harms
2012-03-06  8:44           ` walter harms
2012-03-16 19:55           ` H. Peter Anvin
2012-03-16 19:55             ` H. Peter Anvin
2012-03-18 14:33             ` walter harms
2012-03-18 14:33               ` walter harms
2012-03-16 15:20     ` Matt Fleming
2012-03-16 21:27     ` [tip:x86/urgent] x86, efi: Fix " tip-bot for Dan Carpenter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120302190128.GC3951@elgon.mountain \
    --to=dan.carpenter@oracle.com \
    --cc=hpa@zytor.com \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=m.b.lankhorst@gmail.com \
    --cc=matt.fleming@intel.com \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.