From: Jaswinder Singh Rajput <jaswinder@kernel.org>
To: Ingo Molnar <mingo@elte.hu>, x86 maintainers <x86@kernel.org>,
Pavel Machek <pavel@ucw.cz>, LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH -tip] x86: acpi/sleep.c saved_magic fix overflow
Date: Fri, 10 Apr 2009 23:06:55 +0530 [thread overview]
Message-ID: <1239385015.3169.15.camel@ht.satnam> (raw)
Impact: fix overflow
Constant 0x123456789abcdef0 is so big for a long.
So using saved_magic 0x12345678 for both 32 and 64 bit.
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
---
arch/x86/kernel/acpi/sleep.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index 7c243a2..1ad317a 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -94,7 +94,6 @@ int acpi_save_state_mem(void)
#ifndef CONFIG_64BIT
header->pmode_entry = (u32)&wakeup_pmode_return;
header->pmode_cr3 = (u32)(swsusp_pg_dir - __PAGE_OFFSET);
- saved_magic = 0x12345678;
#else /* CONFIG_64BIT */
header->trampoline_segment = setup_trampoline() >> 4;
#ifdef CONFIG_SMP
@@ -104,8 +103,8 @@ int acpi_save_state_mem(void)
initial_gs = per_cpu_offset(smp_processor_id());
#endif
initial_code = (unsigned long)wakeup_long64;
- saved_magic = 0x123456789abcdef0;
#endif /* CONFIG_64BIT */
+ saved_magic = 0x12345678;
return 0;
}
--
1.6.0.6
next reply other threads:[~2009-04-10 17:37 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-10 17:36 Jaswinder Singh Rajput [this message]
2009-04-10 17:50 ` [PATCH -tip] x86: acpi/sleep.c saved_magic fix overflow Cyrill Gorcunov
2009-04-10 17:53 ` Ray Lee
2009-04-10 17:55 ` Pavel Machek
2009-04-10 18:05 ` Jaswinder Singh Rajput
2009-04-10 18:11 ` Pavel Machek
2009-04-10 18:14 ` Cyrill Gorcunov
2009-04-10 18:15 ` Jaswinder Singh Rajput
2009-04-10 19:13 ` Sam Ravnborg
2009-04-10 19:16 ` Jaswinder Singh Rajput
2009-04-10 19:29 ` Sam Ravnborg
2009-04-10 19:49 ` Jaswinder Singh Rajput
2009-04-10 20:15 ` Pavel Machek
2009-04-12 17:25 ` Rafael J. Wysocki
2009-04-12 17:30 ` Ingo Molnar
2009-04-10 19:51 ` Thomas Gleixner
2009-04-10 18:13 ` Thomas Gleixner
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=1239385015.3169.15.camel@ht.satnam \
--to=jaswinder@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=pavel@ucw.cz \
--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.