diff for duplicates of <20200325121912.GJ9917@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 773212a..f2a31c0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -53,7 +53,7 @@ Part of my job as a maintainer :-) > > > @@ -317,7 +317,7 @@ static void set_max_cpu_num(void) > > > /* get the highest possible cpu number for a sparse allocation */ > > > ret = snprintf(path, PATH_MAX, "%s/devices/system/cpu/possible", mnt); -> > > - if (ret = PATH_MAX) { +> > > - if (ret == PATH_MAX) { > > > + if (ret >= PATH_MAX) { > > > pr_err("sysfs path crossed PATH_MAX(%d) size\n", PATH_MAX); > > > goto out; @@ -61,7 +61,7 @@ Part of my job as a maintainer :-) > > > @@ -328,7 +328,7 @@ static void set_max_cpu_num(void) > > > /* get the highest present cpu number for a sparse allocation */ > > > ret = snprintf(path, PATH_MAX, "%s/devices/system/cpu/present", mnt); -> > > - if (ret = PATH_MAX) { +> > > - if (ret == PATH_MAX) { > > > + if (ret >= PATH_MAX) { > > > pr_err("sysfs path crossed PATH_MAX(%d) size\n", PATH_MAX); > > > goto out; @@ -69,7 +69,7 @@ Part of my job as a maintainer :-) > > > @@ -356,7 +356,7 @@ static void set_max_node_num(void) > > > /* get the highest possible cpu number for a sparse allocation */ > > > ret = snprintf(path, PATH_MAX, "%s/devices/system/node/possible", mnt); -> > > - if (ret = PATH_MAX) { +> > > - if (ret == PATH_MAX) { > > > + if (ret >= PATH_MAX) { > > > pr_err("sysfs path crossed PATH_MAX(%d) size\n", PATH_MAX); > > > goto out; @@ -77,7 +77,7 @@ Part of my job as a maintainer :-) > > > @@ -441,7 +441,7 @@ int cpu__setup_cpunode_map(void) > > > return 0; > > > n = snprintf(path, PATH_MAX, "%s/devices/system/node", mnt); -> > > - if (n = PATH_MAX) { +> > > - if (n == PATH_MAX) { > > > + if (n >= PATH_MAX) { > > > pr_err("sysfs path crossed PATH_MAX(%d) size\n", PATH_MAX); > > > return -1; @@ -85,7 +85,7 @@ Part of my job as a maintainer :-) > > > @@ -456,7 +456,7 @@ int cpu__setup_cpunode_map(void) > > > continue; > > > n = snprintf(buf, PATH_MAX, "%s/%s", path, dent1->d_name); -> > > - if (n = PATH_MAX) { +> > > - if (n == PATH_MAX) { > > > + if (n >= PATH_MAX) { > > > pr_err("sysfs path crossed PATH_MAX(%d) size\n", PATH_MAX); > > > continue; diff --git a/a/content_digest b/N1/content_digest index c5083ea..5252d04 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\075a8e792-dc9e-6169-4dd2-8758967c50e2@wanadoo.fr\0" "From\0Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>\0" "Subject\0Re: [PATCH V2] perf cpumap: Fix snprintf overflow check\0" - "Date\0Wed, 25 Mar 2020 12:19:12 +0000\0" + "Date\0Wed, 25 Mar 2020 09:19:12 -0300\0" "To\0Christophe JAILLET <christophe.jaillet@wanadoo.fr>\0" "Cc\0Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>" peterz@infradead.org @@ -76,7 +76,7 @@ "> > > @@ -317,7 +317,7 @@ static void set_max_cpu_num(void)\n" "> > > \t/* get the highest possible cpu number for a sparse allocation */\n" "> > > \tret = snprintf(path, PATH_MAX, \"%s/devices/system/cpu/possible\", mnt);\n" - "> > > -\tif (ret = PATH_MAX) {\n" + "> > > -\tif (ret == PATH_MAX) {\n" "> > > +\tif (ret >= PATH_MAX) {\n" "> > > \t\tpr_err(\"sysfs path crossed PATH_MAX(%d) size\\n\", PATH_MAX);\n" "> > > \t\tgoto out;\n" @@ -84,7 +84,7 @@ "> > > @@ -328,7 +328,7 @@ static void set_max_cpu_num(void)\n" "> > > \t/* get the highest present cpu number for a sparse allocation */\n" "> > > \tret = snprintf(path, PATH_MAX, \"%s/devices/system/cpu/present\", mnt);\n" - "> > > -\tif (ret = PATH_MAX) {\n" + "> > > -\tif (ret == PATH_MAX) {\n" "> > > +\tif (ret >= PATH_MAX) {\n" "> > > \t\tpr_err(\"sysfs path crossed PATH_MAX(%d) size\\n\", PATH_MAX);\n" "> > > \t\tgoto out;\n" @@ -92,7 +92,7 @@ "> > > @@ -356,7 +356,7 @@ static void set_max_node_num(void)\n" "> > > \t/* get the highest possible cpu number for a sparse allocation */\n" "> > > \tret = snprintf(path, PATH_MAX, \"%s/devices/system/node/possible\", mnt);\n" - "> > > -\tif (ret = PATH_MAX) {\n" + "> > > -\tif (ret == PATH_MAX) {\n" "> > > +\tif (ret >= PATH_MAX) {\n" "> > > \t\tpr_err(\"sysfs path crossed PATH_MAX(%d) size\\n\", PATH_MAX);\n" "> > > \t\tgoto out;\n" @@ -100,7 +100,7 @@ "> > > @@ -441,7 +441,7 @@ int cpu__setup_cpunode_map(void)\n" "> > > \t\treturn 0;\n" "> > > \tn = snprintf(path, PATH_MAX, \"%s/devices/system/node\", mnt);\n" - "> > > -\tif (n = PATH_MAX) {\n" + "> > > -\tif (n == PATH_MAX) {\n" "> > > +\tif (n >= PATH_MAX) {\n" "> > > \t\tpr_err(\"sysfs path crossed PATH_MAX(%d) size\\n\", PATH_MAX);\n" "> > > \t\treturn -1;\n" @@ -108,7 +108,7 @@ "> > > @@ -456,7 +456,7 @@ int cpu__setup_cpunode_map(void)\n" "> > > \t\t\tcontinue;\n" "> > > \t\tn = snprintf(buf, PATH_MAX, \"%s/%s\", path, dent1->d_name);\n" - "> > > -\t\tif (n = PATH_MAX) {\n" + "> > > -\t\tif (n == PATH_MAX) {\n" "> > > +\t\tif (n >= PATH_MAX) {\n" "> > > \t\t\tpr_err(\"sysfs path crossed PATH_MAX(%d) size\\n\", PATH_MAX);\n" "> > > \t\t\tcontinue;\n" @@ -122,4 +122,4 @@ "\n" - Arnaldo -89177d883c9bfb46bedde11a77ad7e5082ab905125852ccffa0ba9356c9e474d +09a31c9fb20a34751ca067451bad2d8e1f5bb3f5778296789b46c5ac35654bac
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.