From: Zou Nan hai <nanhai.zou@intel.com>
To: linux-ia64@vger.kernel.org
Subject: Re: [Fastboot] IA64: kexec seg fault at xrealloc
Date: Mon, 04 Dec 2006 06:48:33 +0000 [thread overview]
Message-ID: <1165214913.3272.46.camel@linux-znh> (raw)
In-Reply-To: <20061204110510.fde8bcdb.akiyama.nobuyuk@jp.fujitsu.com>
On Mon, 2006-12-04 at 10:05, Akiyama, Nobuyuki wrote:
> Hi Jay,
>
> The attacked patch fixes the problem.
> Please try.
>
> diff -Nurp kexec-tools-1.101.org/kexec/arch/ia64/crashdump-ia64.c
> kexec-tools-1.101/kexec/arch/ia64/crashdump-ia64.c
> --- kexec-tools-1.101.org/kexec/arch/ia64/crashdump-ia64.c
> 2006-11-09 19:40:52.000000000 +0900
> +++ kexec-tools-1.101/kexec/arch/ia64/crashdump-ia64.c 2006-11-13
> 19:17:15.000000000 +0900
> @@ -316,9 +316,13 @@ int load_crashdump_segments(struct kexec
> int nr_ranges;
> size_t size;
> void *tmp;
> + long int nr_cpus = 0;
> + if ((nr_cpus = sysconf(_SC_NPROCESSORS_CONF)) < 0)
> + return -1;
> if (info->kexec_flags & KEXEC_ON_CRASH ) {
> if (get_crash_memory_ranges(&mem_range, &nr_ranges) =
> 0) {
> size = sizeof(Elf64_Ehdr) +
> + (nr_cpus + 1) * sizeof(Elf64_Phdr) +
> (nr_ranges + 1) * sizeof(Elf64_Phdr);
> size = (size + EFI_PAGE_SIZE - 1) &
> ~(EFI_PAGE_SIZE - 1);
> tmp = xmalloc(size);
>
Hi,
Thanks for finding the is bug, I missed percpu notes segments in size
calculation here. However I think we should also include the nr_ranges
in calculation.
--- a/kexec/arch/ia64/crashdump-ia64.c 2006-12-04 04:19:42.000000000 -0500
+++ b/kexec/arch/ia64/crashdump-ia64.c 2006-12-04 04:21:23.000000000 -0500
@@ -313,13 +313,15 @@ int load_crashdump_segments(struct kexec
{
//struct memory_range *mem_range, *memmap_p;
struct memory_range *mem_range;
- int nr_ranges;
+ int nr_ranges, nr_cpus;
size_t size;
void *tmp;
+ if ((nr_cpus = sysconf(_SC_NPROCESSORS_CONF)) < 0)
+ return -1;
if (info->kexec_flags & KEXEC_ON_CRASH ) {
if (get_crash_memory_ranges(&mem_range, &nr_ranges) = 0) {
size = sizeof(Elf64_Ehdr) +
- (nr_ranges + 1) * sizeof(Elf64_Phdr);
+ (nr_ranges + nr_cpus + 1) * sizeof(Elf64_Phdr);
size = (size + EFI_PAGE_SIZE - 1) & ~(EFI_PAGE_SIZE - 1);
tmp = xmalloc(size);
memset(tmp, 0, size);
Thanks
Zou Nan hai
> Thanks,
> Akiyama, Nobuyuki
>
next prev parent reply other threads:[~2006-12-04 6:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-04 2:05 [Fastboot] IA64: kexec seg fault at xrealloc Akiyama, Nobuyuki
2006-12-04 6:48 ` Zou Nan hai [this message]
2006-12-04 9:40 ` Akiyama, Nobuyuki
2006-12-04 17:05 ` Jay Lan
2006-12-13 3:45 ` Horms
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=1165214913.3272.46.camel@linux-znh \
--to=nanhai.zou@intel.com \
--cc=linux-ia64@vger.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox