diff for duplicates of <4ECF8629.7000301@bfs.de> diff --git a/a/1.txt b/N1/1.txt index c94895e..9e5c631 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -29,17 +29,17 @@ Am 25.11.2011 12:22, schrieb walter harms: >> case SIOCADDRT: >> if (copy_from_user(&nr_route, arg, sizeof(struct nr_route_struct))) >> return -EFAULT; ->> - if ((dev = nr_ax25_dev_get(nr_route.device)) = NULL) +>> - if ((dev = nr_ax25_dev_get(nr_route.device)) == NULL) >> + if (nr_route.ndigis > AX25_MAX_DIGIS) >> return -EINVAL; >> - if (nr_route.ndigis < 0 || nr_route.ndigis > AX25_MAX_DIGIS) { >> - dev_put(dev); ->> + if ((dev = nr_ax25_dev_get(nr_route.device)) = NULL) +>> + if ((dev = nr_ax25_dev_get(nr_route.device)) == NULL) >> return -EINVAL; >> - } >> switch (nr_route.type) { >> case NETROM_NODE: ->> if (strnlen(nr_route.mnemonic, 7) = 7) { +>> if (strnlen(nr_route.mnemonic, 7) == 7) { > > I realy do not know if that matters but some use AX25_MAX_DIGIS as array > and therefore it should be >=AX25_MAX_DIGIS. diff --git a/a/content_digest b/N1/content_digest index 401566e..1854119 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,8 +2,9 @@ "ref\09f87aed932fc551c6f5c474b39d01fb337237a7e.1322214950.git.ralf@linux-mips.org\0" "ref\04ECF7A76.3090305@bfs.de\0" "From\0walter harms <wharms@bfs.de>\0" - "Subject\0Re: [PATCH 3/4] NET: NETROM: Cleanup argument SIOCADDRT ioctl argument\0" - "Date\0Fri, 25 Nov 2011 12:12:25 +0000\0" + "Subject\0Re: [PATCH 3/4] NET: NETROM: Cleanup argument SIOCADDRT ioctl argument checking.\0" + "Date\0Fri, 25 Nov 2011 13:12:25 +0100\0" + "To\0\0" "Cc\0Ralf Baechle <ralf@linux-mips.org>" David S. Miller <davem@davemloft.net> netdev@vger.kernel.org @@ -43,17 +44,17 @@ ">> \tcase SIOCADDRT:\n" ">> \t\tif (copy_from_user(&nr_route, arg, sizeof(struct nr_route_struct)))\n" ">> \t\t\treturn -EFAULT;\n" - ">> -\t\tif ((dev = nr_ax25_dev_get(nr_route.device)) = NULL)\n" + ">> -\t\tif ((dev = nr_ax25_dev_get(nr_route.device)) == NULL)\n" ">> +\t\tif (nr_route.ndigis > AX25_MAX_DIGIS)\n" ">> \t\t\treturn -EINVAL;\n" ">> -\t\tif (nr_route.ndigis < 0 || nr_route.ndigis > AX25_MAX_DIGIS) {\n" ">> -\t\t\tdev_put(dev);\n" - ">> +\t\tif ((dev = nr_ax25_dev_get(nr_route.device)) = NULL)\n" + ">> +\t\tif ((dev = nr_ax25_dev_get(nr_route.device)) == NULL)\n" ">> \t\t\treturn -EINVAL;\n" ">> -\t\t}\n" ">> \t\tswitch (nr_route.type) {\n" ">> \t\tcase NETROM_NODE:\n" - ">> \t\t\tif (strnlen(nr_route.mnemonic, 7) = 7) {\n" + ">> \t\t\tif (strnlen(nr_route.mnemonic, 7) == 7) {\n" "> \n" "> I realy do not know if that matters but some use AX25_MAX_DIGIS as array\n" "> and therefore it should be >=AX25_MAX_DIGIS.\n" @@ -72,4 +73,4 @@ "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > -ad59aeae7446fb6b46ea2bb5bfa324134cc854fa6432b328981f2f731a27cf24 +7b7e0401bf89949895d259434a45f05ce92a9d6ea8d6ba6591b9fa9d6d3a33b9
diff --git a/a/1.txt b/N2/1.txt index c94895e..9e5c631 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -29,17 +29,17 @@ Am 25.11.2011 12:22, schrieb walter harms: >> case SIOCADDRT: >> if (copy_from_user(&nr_route, arg, sizeof(struct nr_route_struct))) >> return -EFAULT; ->> - if ((dev = nr_ax25_dev_get(nr_route.device)) = NULL) +>> - if ((dev = nr_ax25_dev_get(nr_route.device)) == NULL) >> + if (nr_route.ndigis > AX25_MAX_DIGIS) >> return -EINVAL; >> - if (nr_route.ndigis < 0 || nr_route.ndigis > AX25_MAX_DIGIS) { >> - dev_put(dev); ->> + if ((dev = nr_ax25_dev_get(nr_route.device)) = NULL) +>> + if ((dev = nr_ax25_dev_get(nr_route.device)) == NULL) >> return -EINVAL; >> - } >> switch (nr_route.type) { >> case NETROM_NODE: ->> if (strnlen(nr_route.mnemonic, 7) = 7) { +>> if (strnlen(nr_route.mnemonic, 7) == 7) { > > I realy do not know if that matters but some use AX25_MAX_DIGIS as array > and therefore it should be >=AX25_MAX_DIGIS. diff --git a/a/content_digest b/N2/content_digest index 401566e..cc23e4f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,8 +2,9 @@ "ref\09f87aed932fc551c6f5c474b39d01fb337237a7e.1322214950.git.ralf@linux-mips.org\0" "ref\04ECF7A76.3090305@bfs.de\0" "From\0walter harms <wharms@bfs.de>\0" - "Subject\0Re: [PATCH 3/4] NET: NETROM: Cleanup argument SIOCADDRT ioctl argument\0" - "Date\0Fri, 25 Nov 2011 12:12:25 +0000\0" + "Subject\0Re: [PATCH 3/4] NET: NETROM: Cleanup argument SIOCADDRT ioctl argument checking.\0" + "Date\0Fri, 25 Nov 2011 13:12:25 +0100\0" + "To\0unlisted-recipients:; (no To-header on input)\0" "Cc\0Ralf Baechle <ralf@linux-mips.org>" David S. Miller <davem@davemloft.net> netdev@vger.kernel.org @@ -43,17 +44,17 @@ ">> \tcase SIOCADDRT:\n" ">> \t\tif (copy_from_user(&nr_route, arg, sizeof(struct nr_route_struct)))\n" ">> \t\t\treturn -EFAULT;\n" - ">> -\t\tif ((dev = nr_ax25_dev_get(nr_route.device)) = NULL)\n" + ">> -\t\tif ((dev = nr_ax25_dev_get(nr_route.device)) == NULL)\n" ">> +\t\tif (nr_route.ndigis > AX25_MAX_DIGIS)\n" ">> \t\t\treturn -EINVAL;\n" ">> -\t\tif (nr_route.ndigis < 0 || nr_route.ndigis > AX25_MAX_DIGIS) {\n" ">> -\t\t\tdev_put(dev);\n" - ">> +\t\tif ((dev = nr_ax25_dev_get(nr_route.device)) = NULL)\n" + ">> +\t\tif ((dev = nr_ax25_dev_get(nr_route.device)) == NULL)\n" ">> \t\t\treturn -EINVAL;\n" ">> -\t\t}\n" ">> \t\tswitch (nr_route.type) {\n" ">> \t\tcase NETROM_NODE:\n" - ">> \t\t\tif (strnlen(nr_route.mnemonic, 7) = 7) {\n" + ">> \t\t\tif (strnlen(nr_route.mnemonic, 7) == 7) {\n" "> \n" "> I realy do not know if that matters but some use AX25_MAX_DIGIS as array\n" "> and therefore it should be >=AX25_MAX_DIGIS.\n" @@ -72,4 +73,4 @@ "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > -ad59aeae7446fb6b46ea2bb5bfa324134cc854fa6432b328981f2f731a27cf24 +1728b15dc5fa474711bcd774f20ee39dd928d063c3711800acafcc05cd497431
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.