diff for duplicates of <1304693032.1849.2.camel@dan> diff --git a/a/1.txt b/N1/1.txt index 9bbc2a2..e587cdc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,7 +9,7 @@ I saw this while reading the code. > > /* Check if this isn't a single byte option */ > if (opt > DCCPO_MAX_RESERVED) { -> if (opt_ptr = opt_end) +> if (opt_ptr == opt_end) > goto out_nonsensical_length; > > len = *opt_ptr++; @@ -42,9 +42,9 @@ Dan > | +++ b/net/dccp/options.c > | @@ -123,6 +123,8 @@ int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq, > | case DCCPO_CHANGE_L ... DCCPO_CONFIRM_R: -> | if (pkt_type = DCCP_PKT_DATA) /* RFC 4340, 6 */ +> | if (pkt_type == DCCP_PKT_DATA) /* RFC 4340, 6 */ > | break; -> | + if (len = 0) +> | + if (len == 0) > | + goto out_invalid_option; > | rc = dccp_feat_parse_options(sk, dreq, mandatory, opt, > | *value, value + 1, len - 1); diff --git a/a/content_digest b/N1/content_digest index c10b921..6ba47ec 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,14 @@ "ref\01304688438.29544.16.camel@dan\0" + "ref\020110506135345.GA3434@gerrit.erg.abdn.ac.uk\0" "From\0Dan Rosenberg <drosenberg@vsecurity.com>\0" "Subject\0Re: [PATCH] dccp: handle invalid feature options length\0" - "Date\0Fri, 06 May 2011 14:43:52 +0000\0" - "To\0dccp@vger.kernel.org\0" + "Date\0Fri, 06 May 2011 10:43:52 -0400\0" + "To\0Gerrit Renker <gerrit@erg.abdn.ac.uk>\0" + "Cc\0davem@davemloft.net" + dccp@vger.kernel.org + netdev@vger.kernel.org + linux-kernel@vger.kernel.org + " security@kernel.org\0" "\00:1\0" "b\0" "\n" @@ -16,7 +22,7 @@ "> \n" "> /* Check if this isn't a single byte option */\n" "> if (opt > DCCPO_MAX_RESERVED) {\n" - "> if (opt_ptr = opt_end)\n" + "> if (opt_ptr == opt_end)\n" "> goto out_nonsensical_length;\n" "> \n" "> len = *opt_ptr++;\n" @@ -49,9 +55,9 @@ "> | +++ b/net/dccp/options.c\n" "> | @@ -123,6 +123,8 @@ int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq,\n" "> | \t\tcase DCCPO_CHANGE_L ... DCCPO_CONFIRM_R:\n" - "> | \t\t\tif (pkt_type = DCCP_PKT_DATA) /* RFC 4340, 6 */\n" + "> | \t\t\tif (pkt_type == DCCP_PKT_DATA) /* RFC 4340, 6 */\n" "> | \t\t\t\tbreak;\n" - "> | +\t\t\tif (len = 0)\n" + "> | +\t\t\tif (len == 0)\n" "> | +\t\t\t\tgoto out_invalid_option;\n" "> | \t\t\trc = dccp_feat_parse_options(sk, dreq, mandatory, opt,\n" "> | \t\t\t\t\t\t *value, value + 1, len - 1);\n" @@ -61,4 +67,4 @@ "> \n" > -- -c65453a2c9db998efd20e8fdf4c62cc3b1e932ac6c0d2b4fd0c4b73dcdfedcfb +77cd0df90471c068104ba6101425e8d5b3bf03d492604260b300ddb89e0895f9
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.