Messages in this thread Patch in this message | | | Date | Mon, 13 Oct 2008 14:14:16 -0700 | From | "H. Peter Anvin" <> | Subject | Re: [PATCH] x86: split e820 reserved entries record to late v4 - fix v7 |
| |
Tony Luck wrote: > On Thu, Sep 4, 2008 at 12:22 PM, Yinghai Lu <yhlu.kernel@gmail.com> wrote: >> On Thu, Sep 4, 2008 at 12:16 PM, Andrew Morton >> <akpm@linux-foundation.org> wrote: >>> On Thu, 4 Sep 2008 21:04:57 +0200 >>> Ingo Molnar <mingo@elte.hu> wrote: >>> >>>> + printk(KERN_DEBUG " __reserve_region_with_split: (%s) [%llx, %llx], res: (%s) [%llx, %llx]\n", >>>> + conflict->name, conflict->start, conflict->end, >>>> + name, start, end); >>> start and end have type resource_size_t. Such types CANNOT be printed >>> unless cast to a known type. >>> >>> Because there is a %s following an incorrect %lld, the above code will >>> crash the machine. >> should just remove those lines. > > This didn't happen. These lines are still in the version that went into > Linus' tree over the weekend for 2.6.28. On the ia64 build they spit > out a bunch of warnings: > > kernel/resource.c:554: warning: format '%llx' expects type 'long long > unsigned int', but argument 3 has type 'resource_size_t' > > Ditto for args 4, 6 and 7 on the same line. >
Here is a fix... currently running standard tests on it.
-hpa
From 2d7c0377c3c98d2605704e67e64d1d19aa30ced3 Mon Sep 17 00:00:00 2001 From: H. Peter Anvin <hpa@zytor.com> Date: Mon, 13 Oct 2008 14:11:03 -0700 Subject: [PATCH] resource: fix printk() of resource_size_t
Impact: crash on 32-bit platforms, warnings on 64-bit platforms
When printk'ing resource_size_t, we have to explicitly cast them to unsigned long long in order to be safe on all platforms. We must not use %z since that applies to size_t, which is frequently not the same type as resource_size_t.
Signed-off-by: H. Peter Anvin <hpa@zytor.com> --- kernel/resource.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/kernel/resource.c b/kernel/resource.c index 414d6fc..f747fb6 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -550,8 +550,12 @@ static void __init __reserve_region_with_split(struct resource *root, if (!res) { printk(KERN_DEBUG " __reserve_region_with_split: (%s) [%llx, %llx], res: (%s) [%llx, %llx]\n", - conflict->name, conflict->start, conflict->end, - name, start, end); + conflict->name, + (unsigned long long)conflict->start, + (unsigned long long)conflict->end, + name, + (unsigned long long)start, + (unsigned long long)end); /* failed, split and try again */ -- 1.6.0.2
| |