From: Simon Horman <horms@verge.net.au>
To: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
"kexec@lists.infradead.org" <kexec@lists.infradead.org>,
"Eric W. Biederman" <ebiederm@xmission.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] kexec: avoid freeing NULL pointer in function kimage_crash_alloc
Date: Fri, 22 Feb 2013 15:12:15 -0800 [thread overview]
Message-ID: <20130222231214.GH4737@verge.net.au> (raw)
In-Reply-To: <5126F92A.2030007@cn.fujitsu.com>
On Fri, Feb 22, 2013 at 12:50:50PM +0800, Zhang Yanfei wrote:
> Though there is no error if we free a NULL pointer, I think we could
> avoid this behaviour. Change the code a little in kimage_crash_alloc()
> could avoid this kind of unnecessary free.
>
> Cc: "Eric W. Biederman" <ebiederm@xmission.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Reviewed-by: Simon Horman <horms@verge.net.au>
> ---
> kernel/kexec.c | 15 +++++++--------
> 1 files changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/kernel/kexec.c b/kernel/kexec.c
> index 5e4bd78..4e96fa7 100644
> --- a/kernel/kexec.c
> +++ b/kernel/kexec.c
> @@ -310,7 +310,7 @@ static int kimage_crash_alloc(struct kimage **rimage, unsigned long entry,
> mend = mstart + image->segment[i].memsz - 1;
> /* Ensure we are within the crash kernel limits */
> if ((mstart < crashk_res.start) || (mend > crashk_res.end))
> - goto out;
> + goto out_free;
> }
>
> /*
> @@ -323,16 +323,15 @@ static int kimage_crash_alloc(struct kimage **rimage, unsigned long entry,
> get_order(KEXEC_CONTROL_PAGE_SIZE));
> if (!image->control_code_page) {
> printk(KERN_ERR "Could not allocate control_code_buffer\n");
> - goto out;
> + goto out_free;
> }
>
> - result = 0;
> -out:
> - if (result == 0)
> - *rimage = image;
> - else
> - kfree(image);
> + *rimage = image;
> + return 0;
>
> +out_free:
> + kfree(image);
> +out:
> return result;
> }
>
> --
> 1.7.1
>
> _______________________________________________
> kexec mailing list
> kexec@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/kexec
>
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
prev parent reply other threads:[~2013-02-23 10:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-22 4:50 [PATCH] kexec: avoid freeing NULL pointer in function kimage_crash_alloc Zhang Yanfei
2013-02-22 23:12 ` Simon Horman [this message]
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=20130222231214.GH4737@verge.net.au \
--to=horms@verge.net.au \
--cc=akpm@linux-foundation.org \
--cc=ebiederm@xmission.com \
--cc=kexec@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=zhangyanfei@cn.fujitsu.com \
/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