diff for duplicates of <201205140936.56960.hans.schillstrom@ericsson.com> diff --git a/a/1.txt b/N1/1.txt index 7b07626..e5cd887 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,8 +21,8 @@ I guess it was input to hmark_addr_mask() that complains ? > > /* Not enough header? */ > icmph = skb_header_pointer(skb, *nhoff + iphsz, sizeof(_ih), &_ih); -> - if (icmph = NULL && icmph->type > NR_ICMP_TYPES) -> + if (icmph = NULL || icmph->type > NR_ICMP_TYPES) +> - if (icmph == NULL && icmph->type > NR_ICMP_TYPES) +> + if (icmph == NULL || icmph->type > NR_ICMP_TYPES) > return 0; > > /* Error message? */ diff --git a/a/content_digest b/N1/content_digest index d9abf3e..6cde833 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020120512110003.GB19472@elgon.mountain\0" "From\0Hans Schillstrom <hans.schillstrom@ericsson.com>\0" "Subject\0Re: [patch] netfilter: potential NULL dereference in get_inner_hdr()\0" - "Date\0Mon, 14 May 2012 07:36:55 +0000\0" + "Date\0Mon, 14 May 2012 09:36:55 +0200\0" "To\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Cc\0Pablo Neira Ayuso <pablo@netfilter.org>" Patrick McHardy <kaber@trash.net> @@ -36,8 +36,8 @@ "> \n" "> \t/* Not enough header? */\n" "> \ticmph = skb_header_pointer(skb, *nhoff + iphsz, sizeof(_ih), &_ih);\n" - "> -\tif (icmph = NULL && icmph->type > NR_ICMP_TYPES)\n" - "> +\tif (icmph = NULL || icmph->type > NR_ICMP_TYPES)\n" + "> -\tif (icmph == NULL && icmph->type > NR_ICMP_TYPES)\n" + "> +\tif (icmph == NULL || icmph->type > NR_ICMP_TYPES)\n" "> \t\treturn 0;\n" "> \n" "> \t/* Error message? */\n" @@ -51,4 +51,4 @@ "Regards\n" Hans Schillstrom <hans.schillstrom@ericsson.com> -7487bf9e63f5f17b7d390cad949a717c91c8cbd27674cb0f5083fb76d6ed483c +4d19b5a25ff22c2aaf4a14f15ca0dca0a42f810a5320569443bc0a8ea12f1032
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.