diff for duplicates of <1304688438.29544.16.camel@dan> diff --git a/a/1.txt b/N1/1.txt index 194de36..84ba4fa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,9 +16,9 @@ index f06ffcf..4b2ab65 100644 +++ 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 6d4b7a0..f7ab827 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,12 @@ "From\0Dan Rosenberg <drosenberg@vsecurity.com>\0" "Subject\0[PATCH] dccp: handle invalid feature options length\0" - "Date\0Fri, 06 May 2011 13:27:18 +0000\0" - "To\0dccp@vger.kernel.org\0" + "Date\0Fri, 06 May 2011 09:27:18 -0400\0" + "To\0gerrit@erg.abdn.ac.uk" + " davem@davemloft.net\0" + "Cc\0dccp@vger.kernel.org" + netdev@vger.kernel.org + linux-kernel@vger.kernel.org + " security@kernel.org\0" "\00:1\0" "b\0" "A length of zero (after subtracting two for the type and len fields) for\n" @@ -22,12 +27,12 @@ "+++ 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" " \t\t\tif (rc)" -856740472fcdfd92431b46b6e76767cd27e764052fbaa1dad4d739e757765df7 +40eea948b18320852ee464c304be49552d181c89d0166d9c52867d64ed4e47ce
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.