diff for duplicates of <4D341C35.80506@bfs.de> diff --git a/a/1.txt b/N1/1.txt index 66c5bf9..512c067 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,12 +15,12 @@ Am 17.01.2011 11:08, schrieb Vasiliy Kulikov: > --- a/arch/arm/mach-omap2/smartreflex.c > +++ b/arch/arm/mach-omap2/smartreflex.c > @@ -260,7 +260,10 @@ static int sr_late_init(struct omap_sr *sr_info) -> if (sr_class->class_type = SR_CLASS2 && +> if (sr_class->class_type == SR_CLASS2 && > sr_class->notify_flags && sr_info->irq) { > > + ret = -ENOMEM; > name = kzalloc(SMARTREFLEX_NAME_LEN + 1, GFP_KERNEL); -> + if (name = NULL) +> + if (name == NULL) > + goto error; > strcpy(name, "sr_"); > strcat(name, sr_info->voltdm->name); diff --git a/a/content_digest b/N1/content_digest index f4b9657..88b8d0d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,14 @@ "ref\01295258922-31242-1-git-send-email-segoon@openwall.com\0" "From\0walter harms <wharms@bfs.de>\0" "Subject\0Re: [PATCH] arm: mach-omap2: potential NULL dereference\0" - "Date\0Mon, 17 Jan 2011 10:38:45 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Mon, 17 Jan 2011 11:38:45 +0100\0" + "To\0Vasiliy Kulikov <segoon@openwall.com>\0" + "Cc\0kernel-janitors@vger.kernel.org" + Tony Lindgren <tony@atomide.com> + Russell King <linux@arm.linux.org.uk> + linux-omap@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "\n" @@ -22,12 +28,12 @@ "> --- a/arch/arm/mach-omap2/smartreflex.c\n" "> +++ b/arch/arm/mach-omap2/smartreflex.c\n" "> @@ -260,7 +260,10 @@ static int sr_late_init(struct omap_sr *sr_info)\n" - "> \tif (sr_class->class_type = SR_CLASS2 &&\n" + "> \tif (sr_class->class_type == SR_CLASS2 &&\n" "> \t\tsr_class->notify_flags && sr_info->irq) {\n" "> \n" "> +\t\tret = -ENOMEM;\n" "> \t\tname = kzalloc(SMARTREFLEX_NAME_LEN + 1, GFP_KERNEL);\n" - "> +\t\tif (name = NULL)\n" + "> +\t\tif (name == NULL)\n" "> +\t\t\tgoto error;\n" "> \t\tstrcpy(name, \"sr_\");\n" "> \t\tstrcat(name, sr_info->voltdm->name);\n" @@ -39,4 +45,4 @@ "re,\n" wh -65118c1e04c68d1da341a96d3f9a447b2aa7a26e83c01b5797e899635e11b13d +3e04cbd6d6e20ee67065a0a82060210d0cf0fc6e2446dd6ea9ba377530955528
diff --git a/a/1.txt b/N2/1.txt index 66c5bf9..512c067 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -15,12 +15,12 @@ Am 17.01.2011 11:08, schrieb Vasiliy Kulikov: > --- a/arch/arm/mach-omap2/smartreflex.c > +++ b/arch/arm/mach-omap2/smartreflex.c > @@ -260,7 +260,10 @@ static int sr_late_init(struct omap_sr *sr_info) -> if (sr_class->class_type = SR_CLASS2 && +> if (sr_class->class_type == SR_CLASS2 && > sr_class->notify_flags && sr_info->irq) { > > + ret = -ENOMEM; > name = kzalloc(SMARTREFLEX_NAME_LEN + 1, GFP_KERNEL); -> + if (name = NULL) +> + if (name == NULL) > + goto error; > strcpy(name, "sr_"); > strcat(name, sr_info->voltdm->name); diff --git a/a/content_digest b/N2/content_digest index f4b9657..9631111 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\01295258922-31242-1-git-send-email-segoon@openwall.com\0" - "From\0walter harms <wharms@bfs.de>\0" - "Subject\0Re: [PATCH] arm: mach-omap2: potential NULL dereference\0" - "Date\0Mon, 17 Jan 2011 10:38:45 +0000\0" + "From\0wharms@bfs.de (walter harms)\0" + "Subject\0[PATCH] arm: mach-omap2: potential NULL dereference\0" + "Date\0Mon, 17 Jan 2011 11:38:45 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -22,12 +22,12 @@ "> --- a/arch/arm/mach-omap2/smartreflex.c\n" "> +++ b/arch/arm/mach-omap2/smartreflex.c\n" "> @@ -260,7 +260,10 @@ static int sr_late_init(struct omap_sr *sr_info)\n" - "> \tif (sr_class->class_type = SR_CLASS2 &&\n" + "> \tif (sr_class->class_type == SR_CLASS2 &&\n" "> \t\tsr_class->notify_flags && sr_info->irq) {\n" "> \n" "> +\t\tret = -ENOMEM;\n" "> \t\tname = kzalloc(SMARTREFLEX_NAME_LEN + 1, GFP_KERNEL);\n" - "> +\t\tif (name = NULL)\n" + "> +\t\tif (name == NULL)\n" "> +\t\t\tgoto error;\n" "> \t\tstrcpy(name, \"sr_\");\n" "> \t\tstrcat(name, sr_info->voltdm->name);\n" @@ -39,4 +39,4 @@ "re,\n" wh -65118c1e04c68d1da341a96d3f9a447b2aa7a26e83c01b5797e899635e11b13d +f7d99993e2633aacc37849a8ce59fba089d2d54a1544f7c602c9ac785876370f
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.