diff for duplicates of <20170218213459.GA32320@mwanda> diff --git a/a/1.txt b/N1/1.txt index 811f8c2..6b7d158 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,5 +1,5 @@ kstrtouint() can return a couple different error codes so the check for -"ret = -EINVAL" is wrong and static analysis tools correctly complain +"ret == -EINVAL" is wrong and static analysis tools correctly complain that we can use "num" without initializing it. It's not super harmful because we check the bounds. But it's also easy enough to fix. @@ -13,7 +13,7 @@ index 956c7bce80d1..311ce92384b7 100644 if (!val) return -EINVAL; ret = kstrtouint(val, 0, &num); -- if (ret = -EINVAL || num < min || num > max) +- if (ret == -EINVAL || num < min || num > max) + if (ret) + return ret; + if (num < min || num > max) diff --git a/a/content_digest b/N1/content_digest index dcac241..e820322 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,9 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] sunrpc: silence uninitialized variable warning\0" - "Date\0Sat, 18 Feb 2017 21:34:59 +0000\0" + "Date\0Sun, 19 Feb 2017 00:34:59 +0300\0" "To\0J. Bruce Fields <bfields@fieldses.org>\0" "Cc\0Anna Schumaker <anna.schumaker@netapp.com>" + J. Bruce Fields <bfields@fieldses.org> Jeff Layton <jlayton@poochiereds.net> David S. Miller <davem@davemloft.net> linux-nfs@vger.kernel.org @@ -11,7 +12,7 @@ "\00:1\0" "b\0" "kstrtouint() can return a couple different error codes so the check for\n" - "\"ret = -EINVAL\" is wrong and static analysis tools correctly complain\n" + "\"ret == -EINVAL\" is wrong and static analysis tools correctly complain\n" "that we can use \"num\" without initializing it. It's not super harmful\n" "because we check the bounds. But it's also easy enough to fix.\n" "\n" @@ -25,7 +26,7 @@ " \tif (!val)\n" " \t\treturn -EINVAL;\n" " \tret = kstrtouint(val, 0, &num);\n" - "-\tif (ret = -EINVAL || num < min || num > max)\n" + "-\tif (ret == -EINVAL || num < min || num > max)\n" "+\tif (ret)\n" "+\t\treturn ret;\n" "+\tif (num < min || num > max)\n" @@ -33,4 +34,4 @@ " \t*((unsigned int *)kp->arg) = num;\n" " \treturn 0;" -14fd9ed6ea7ce8a69212a435bae24a53d5574f527a52db427f978798e443f0ee +5f46ae7a12eabc0595e1c429a192d1fa2841d8774fd7fc33760e9a44f8e130cf
diff --git a/a/1.txt b/N2/1.txt index 811f8c2..966ca5b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,9 +1,9 @@ kstrtouint() can return a couple different error codes so the check for -"ret = -EINVAL" is wrong and static analysis tools correctly complain +"ret == -EINVAL" is wrong and static analysis tools correctly complain that we can use "num" without initializing it. It's not super harmful because we check the bounds. But it's also easy enough to fix. -Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> +Signed-off-by: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 956c7bce80d1..311ce92384b7 100644 @@ -13,10 +13,14 @@ index 956c7bce80d1..311ce92384b7 100644 if (!val) return -EINVAL; ret = kstrtouint(val, 0, &num); -- if (ret = -EINVAL || num < min || num > max) +- if (ret == -EINVAL || num < min || num > max) + if (ret) + return ret; + if (num < min || num > max) return -EINVAL; *((unsigned int *)kp->arg) = num; return 0; +-- +To unsubscribe from this list: send the line "unsubscribe linux-nfs" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index dcac241..f56005f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,21 +1,22 @@ - "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" + "From\0Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>\0" "Subject\0[patch] sunrpc: silence uninitialized variable warning\0" - "Date\0Sat, 18 Feb 2017 21:34:59 +0000\0" - "To\0J. Bruce Fields <bfields@fieldses.org>\0" - "Cc\0Anna Schumaker <anna.schumaker@netapp.com>" - Jeff Layton <jlayton@poochiereds.net> - David S. Miller <davem@davemloft.net> - linux-nfs@vger.kernel.org - netdev@vger.kernel.org - " kernel-janitors@vger.kernel.org\0" + "Date\0Sun, 19 Feb 2017 00:34:59 +0300\0" + "To\0J. Bruce Fields <bfields-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>\0" + "Cc\0Anna Schumaker <anna.schumaker-HgOvQuBEEgTQT0dZR+AlfA@public.gmane.org>" + J. Bruce Fields <bfields-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org> + Jeff Layton <jlayton-vpEMnDpepFuMZCB2o+C8xQ@public.gmane.org> + David S. Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> + linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " kernel-janitors-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "kstrtouint() can return a couple different error codes so the check for\n" - "\"ret = -EINVAL\" is wrong and static analysis tools correctly complain\n" + "\"ret == -EINVAL\" is wrong and static analysis tools correctly complain\n" "that we can use \"num\" without initializing it. It's not super harmful\n" "because we check the bounds. But it's also easy enough to fix.\n" "\n" - "Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>\n" + "Signed-off-by: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>\n" "\n" "diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c\n" "index 956c7bce80d1..311ce92384b7 100644\n" @@ -25,12 +26,16 @@ " \tif (!val)\n" " \t\treturn -EINVAL;\n" " \tret = kstrtouint(val, 0, &num);\n" - "-\tif (ret = -EINVAL || num < min || num > max)\n" + "-\tif (ret == -EINVAL || num < min || num > max)\n" "+\tif (ret)\n" "+\t\treturn ret;\n" "+\tif (num < min || num > max)\n" " \t\treturn -EINVAL;\n" " \t*((unsigned int *)kp->arg) = num;\n" - " \treturn 0;" + " \treturn 0;\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-nfs\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -14fd9ed6ea7ce8a69212a435bae24a53d5574f527a52db427f978798e443f0ee +fbc1279aab41d701d192d90d04878cc0bc0a37949e7c91997e8a89d7e7748d99
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.