* [PATCH v2] S3C: NAND: Check the existence of nr_map before copying
@ 2010-01-14 2:15 Ramax Lo
2010-01-14 2:19 ` Ben Dooks
0 siblings, 1 reply; 2+ messages in thread
From: Ramax Lo @ 2010-01-14 2:15 UTC (permalink / raw)
To: linux-arm-kernel
Since the structure field nr_map is optional, we need to check whether the
chip number map is provided to avoid unexpected NULL pointer exception.
Signed-off-by: Ramax Lo <ramaxlo@gmail.com>
---
arch/arm/plat-s3c/dev-nand.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/plat-s3c/dev-nand.c b/arch/arm/plat-s3c/dev-nand.c
index 84808cc..a52fb6c 100644
--- a/arch/arm/plat-s3c/dev-nand.c
+++ b/arch/arm/plat-s3c/dev-nand.c
@@ -58,8 +58,8 @@ static int __init s3c_nand_copy_set(struct s3c2410_nand_set *set)
return -ENOMEM;
}
- size = sizeof(int) * set->nr_chips;
- if (size) {
+ if (set->nr_map && set->nr_chips) {
+ size = sizeof(int) * set->nr_chips;
ptr = kmemdup(set->nr_map, size, GFP_KERNEL);
set->nr_map = ptr;
--
1.5.4.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v2] S3C: NAND: Check the existence of nr_map before copying
2010-01-14 2:15 [PATCH v2] S3C: NAND: Check the existence of nr_map before copying Ramax Lo
@ 2010-01-14 2:19 ` Ben Dooks
0 siblings, 0 replies; 2+ messages in thread
From: Ben Dooks @ 2010-01-14 2:19 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jan 14, 2010 at 10:15:05AM +0800, Ramax Lo wrote:
> Since the structure field nr_map is optional, we need to check whether the
> chip number map is provided to avoid unexpected NULL pointer exception.
ok, will merge this for linus
> Signed-off-by: Ramax Lo <ramaxlo@gmail.com>
> ---
> arch/arm/plat-s3c/dev-nand.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/plat-s3c/dev-nand.c b/arch/arm/plat-s3c/dev-nand.c
> index 84808cc..a52fb6c 100644
> --- a/arch/arm/plat-s3c/dev-nand.c
> +++ b/arch/arm/plat-s3c/dev-nand.c
> @@ -58,8 +58,8 @@ static int __init s3c_nand_copy_set(struct s3c2410_nand_set *set)
> return -ENOMEM;
> }
>
> - size = sizeof(int) * set->nr_chips;
> - if (size) {
> + if (set->nr_map && set->nr_chips) {
> + size = sizeof(int) * set->nr_chips;
> ptr = kmemdup(set->nr_map, size, GFP_KERNEL);
> set->nr_map = ptr;
>
> --
> 1.5.4.3
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
--
Ben
Q: What's a light-year?
A: One-third less calories than a regular year.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-01-14 2:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-14 2:15 [PATCH v2] S3C: NAND: Check the existence of nr_map before copying Ramax Lo
2010-01-14 2:19 ` Ben Dooks
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).