diff for duplicates of <20110119125721.GA9203@albatros> diff --git a/a/1.txt b/N1/1.txt index d642aef..5b42b58 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,14 +13,14 @@ index 77ecebf..697d8d4 100644 --- a/arch/arm/mach-omap2/smartreflex.c +++ b/arch/arm/mach-omap2/smartreflex.c @@ -260,9 +260,11 @@ 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) { - name = kzalloc(SMARTREFLEX_NAME_LEN + 1, GFP_KERNEL); - strcpy(name, "sr_"); - strcat(name, sr_info->voltdm->name); + name = kasprintf(GFP_KERNEL, "sr_%s", sr_info->voltdm->name); -+ if (name = NULL) { ++ if (name == NULL) { + ret = -ENOMEM; + goto error; + } diff --git a/a/content_digest b/N1/content_digest index ecdb153..6cc2f45 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,8 +2,14 @@ "ref\04D341C35.80506@bfs.de\0" "From\0Vasiliy Kulikov <segoon@openwall.com>\0" "Subject\0[PATCH v2] arm: mach-omap2: potential NULL dereference\0" - "Date\0Wed, 19 Jan 2011 12:57:22 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 19 Jan 2011 15:57:22 +0300\0" + "To\0linux-kernel@vger.kernel.org\0" + "Cc\0walter harms <wharms@bfs.de>" + kernel-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\0" "\00:1\0" "b\0" "kzalloc() may fail, if so return -ENOMEM. Also Walter Harms suggested\n" @@ -21,14 +27,14 @@ "--- a/arch/arm/mach-omap2/smartreflex.c\n" "+++ b/arch/arm/mach-omap2/smartreflex.c\n" "@@ -260,9 +260,11 @@ 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\tname = kzalloc(SMARTREFLEX_NAME_LEN + 1, GFP_KERNEL);\n" "-\t\tstrcpy(name, \"sr_\");\n" "-\t\tstrcat(name, sr_info->voltdm->name);\n" "+\t\tname = kasprintf(GFP_KERNEL, \"sr_%s\", sr_info->voltdm->name);\n" - "+\t\tif (name = NULL) {\n" + "+\t\tif (name == NULL) {\n" "+\t\t\tret = -ENOMEM;\n" "+\t\t\tgoto error;\n" "+\t\t}\n" @@ -39,4 +45,4 @@ "Vasiliy Kulikov\n" http://www.openwall.com - bringing security into open computing environments -31ce4901fa9fe3b626ef6e604f88c8e5e21da1881e8660daa0130287025d32ba +8494e91df232c5e97ec7f65ec8bc2bd8120121a98f6d68f2ca69b196b05c1821
diff --git a/a/1.txt b/N2/1.txt index d642aef..5b42b58 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -13,14 +13,14 @@ index 77ecebf..697d8d4 100644 --- a/arch/arm/mach-omap2/smartreflex.c +++ b/arch/arm/mach-omap2/smartreflex.c @@ -260,9 +260,11 @@ 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) { - name = kzalloc(SMARTREFLEX_NAME_LEN + 1, GFP_KERNEL); - strcpy(name, "sr_"); - strcat(name, sr_info->voltdm->name); + name = kasprintf(GFP_KERNEL, "sr_%s", sr_info->voltdm->name); -+ if (name = NULL) { ++ if (name == NULL) { + ret = -ENOMEM; + goto error; + } diff --git a/a/content_digest b/N2/content_digest index ecdb153..9090e86 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,8 @@ "ref\01295258922-31242-1-git-send-email-segoon@openwall.com\0" "ref\04D341C35.80506@bfs.de\0" - "From\0Vasiliy Kulikov <segoon@openwall.com>\0" + "From\0segoon@openwall.com (Vasiliy Kulikov)\0" "Subject\0[PATCH v2] arm: mach-omap2: potential NULL dereference\0" - "Date\0Wed, 19 Jan 2011 12:57:22 +0000\0" + "Date\0Wed, 19 Jan 2011 15:57:22 +0300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -21,14 +21,14 @@ "--- a/arch/arm/mach-omap2/smartreflex.c\n" "+++ b/arch/arm/mach-omap2/smartreflex.c\n" "@@ -260,9 +260,11 @@ 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\tname = kzalloc(SMARTREFLEX_NAME_LEN + 1, GFP_KERNEL);\n" "-\t\tstrcpy(name, \"sr_\");\n" "-\t\tstrcat(name, sr_info->voltdm->name);\n" "+\t\tname = kasprintf(GFP_KERNEL, \"sr_%s\", sr_info->voltdm->name);\n" - "+\t\tif (name = NULL) {\n" + "+\t\tif (name == NULL) {\n" "+\t\t\tret = -ENOMEM;\n" "+\t\t\tgoto error;\n" "+\t\t}\n" @@ -39,4 +39,4 @@ "Vasiliy Kulikov\n" http://www.openwall.com - bringing security into open computing environments -31ce4901fa9fe3b626ef6e604f88c8e5e21da1881e8660daa0130287025d32ba +e296ebfe7741b7b27747de4ce8acd3207751ad6c1fe7fd6f11ced769c4692392
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.