diff for duplicates of <877gtbq2th.fsf_-_@xmission.com> diff --git a/a/1.txt b/N1/1.txt index 7366058..dfb10cf 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -114,7 +114,7 @@ index 291e682..6193d20 100644 + SOCK_SEQPACKET, IPPROTO_SCTP, net); /* If IPv6 socket could not be created, try the IPv4 socket */ - if (err < 0 && family = PF_INET6) + if (err < 0 && family == PF_INET6) - err = inet_ctl_sock_create(&sctp_ctl_sock, AF_INET, + err = inet_ctl_sock_create(&net->sctp.ctl_sock, AF_INET, SOCK_SEQPACKET, IPPROTO_SCTP, @@ -216,9 +216,9 @@ index 9fca103..f2daf61 100644 /* If the packet is an OOTB packet which is temporarily on the * control endpoint, respond with an ABORT. */ -- if (ep = sctp_sk((sctp_get_ctl_sock()))->ep) { +- if (ep == sctp_sk((sctp_get_ctl_sock()))->ep) { + net = sock_net(ep->base.sk); -+ if (ep = sctp_sk(net->sctp.ctl_sock)->ep) { ++ if (ep == sctp_sk(net->sctp.ctl_sock)->ep) { SCTP_INC_STATS(SCTP_MIB_OUTOFBLUES); return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands); } @@ -231,9 +231,9 @@ index 9fca103..f2daf61 100644 /* If the packet is an OOTB packet which is temporarily on the * control endpoint, respond with an ABORT. */ -- if (ep = sctp_sk((sctp_get_ctl_sock()))->ep) { +- if (ep == sctp_sk((sctp_get_ctl_sock()))->ep) { + net = sock_net(ep->base.sk); -+ if (ep = sctp_sk(net->sctp.ctl_sock)->ep) { ++ if (ep == sctp_sk(net->sctp.ctl_sock)->ep) { SCTP_INC_STATS(SCTP_MIB_OUTOFBLUES); return sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands); } @@ -280,8 +280,8 @@ index 9fca103..f2daf61 100644 /* Per the above section, we'll discard the chunk if we have an * endpoint. If this is an OOTB INIT-ACK, treat it as such. */ -- if (ep = sctp_sk((sctp_get_ctl_sock()))->ep) -+ if (ep = sctp_sk(net->sctp.ctl_sock)->ep) +- if (ep == sctp_sk((sctp_get_ctl_sock()))->ep) ++ if (ep == sctp_sk(net->sctp.ctl_sock)->ep) return sctp_sf_ootb(ep, asoc, type, arg, commands); else return sctp_sf_discard_chunk(ep, asoc, type, arg, commands); @@ -324,7 +324,7 @@ index 9fca103..f2daf61 100644 + net = sock_net(ep->base.sk); if (asoc) { /* Treat INIT-ACK as a special case during COOKIE-WAIT. */ - if (chunk->chunk_hdr->type = SCTP_CID_INIT_ACK && + if (chunk->chunk_hdr->type == SCTP_CID_INIT_ACK && @@ -4319,7 +4332,7 @@ static sctp_disposition_t sctp_sf_abort_violation( SCTP_DEC_STATS(SCTP_MIB_CURRESTAB); } diff --git a/a/content_digest b/N1/content_digest index d0cdbb7..21ef7cd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\087zk67q31q.fsf_-_@xmission.com\0" "From\0ebiederm@xmission.com (Eric W. Biederman)\0" "Subject\0[PATCH net-next 5/9] sctp: Make the ctl_sock per network namespace\0" - "Date\0Mon, 06 Aug 2012 18:43:06 +0000\0" + "Date\0Mon, 06 Aug 2012 11:43:06 -0700\0" "To\0David Miller <davem@davemloft.net>\0" "Cc\0Vlad Yasevich <vyasevich@gmail.com>" linux-sctp@vger.kernel.org @@ -132,7 +132,7 @@ "+\t\t\t\t SOCK_SEQPACKET, IPPROTO_SCTP, net);\n" " \n" " \t/* If IPv6 socket could not be created, try the IPv4 socket */\n" - " \tif (err < 0 && family = PF_INET6)\n" + " \tif (err < 0 && family == PF_INET6)\n" "-\t\terr = inet_ctl_sock_create(&sctp_ctl_sock, AF_INET,\n" "+\t\terr = inet_ctl_sock_create(&net->sctp.ctl_sock, AF_INET,\n" " \t\t\t\t\t SOCK_SEQPACKET, IPPROTO_SCTP,\n" @@ -234,9 +234,9 @@ " \t/* If the packet is an OOTB packet which is temporarily on the\n" " \t * control endpoint, respond with an ABORT.\n" " \t */\n" - "-\tif (ep = sctp_sk((sctp_get_ctl_sock()))->ep) {\n" + "-\tif (ep == sctp_sk((sctp_get_ctl_sock()))->ep) {\n" "+\tnet = sock_net(ep->base.sk);\n" - "+\tif (ep = sctp_sk(net->sctp.ctl_sock)->ep) {\n" + "+\tif (ep == sctp_sk(net->sctp.ctl_sock)->ep) {\n" " \t\tSCTP_INC_STATS(SCTP_MIB_OUTOFBLUES);\n" " \t\treturn sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);\n" " \t}\n" @@ -249,9 +249,9 @@ " \t/* If the packet is an OOTB packet which is temporarily on the\n" " \t * control endpoint, respond with an ABORT.\n" " \t */\n" - "-\tif (ep = sctp_sk((sctp_get_ctl_sock()))->ep) {\n" + "-\tif (ep == sctp_sk((sctp_get_ctl_sock()))->ep) {\n" "+\tnet = sock_net(ep->base.sk);\n" - "+\tif (ep = sctp_sk(net->sctp.ctl_sock)->ep) {\n" + "+\tif (ep == sctp_sk(net->sctp.ctl_sock)->ep) {\n" " \t\tSCTP_INC_STATS(SCTP_MIB_OUTOFBLUES);\n" " \t\treturn sctp_sf_tabort_8_4_8(ep, asoc, type, arg, commands);\n" " \t}\n" @@ -298,8 +298,8 @@ " \t/* Per the above section, we'll discard the chunk if we have an\n" " \t * endpoint. If this is an OOTB INIT-ACK, treat it as such.\n" " \t */\n" - "-\tif (ep = sctp_sk((sctp_get_ctl_sock()))->ep)\n" - "+\tif (ep = sctp_sk(net->sctp.ctl_sock)->ep)\n" + "-\tif (ep == sctp_sk((sctp_get_ctl_sock()))->ep)\n" + "+\tif (ep == sctp_sk(net->sctp.ctl_sock)->ep)\n" " \t\treturn sctp_sf_ootb(ep, asoc, type, arg, commands);\n" " \telse\n" " \t\treturn sctp_sf_discard_chunk(ep, asoc, type, arg, commands);\n" @@ -342,7 +342,7 @@ "+\tnet = sock_net(ep->base.sk);\n" " \tif (asoc) {\n" " \t\t/* Treat INIT-ACK as a special case during COOKIE-WAIT. */\n" - " \t\tif (chunk->chunk_hdr->type = SCTP_CID_INIT_ACK &&\n" + " \t\tif (chunk->chunk_hdr->type == SCTP_CID_INIT_ACK &&\n" "@@ -4319,7 +4332,7 @@ static sctp_disposition_t sctp_sf_abort_violation(\n" " \t\t\tSCTP_DEC_STATS(SCTP_MIB_CURRESTAB);\n" " \t\t}\n" @@ -396,4 +396,4 @@ "-- \n" 1.7.5.4 -67bb5dd146fe40f0707225cef5158b9d68a9b5874a02e983b179621f5641f5b9 +baa3f95d1ec0848b06f600050acc120a6d06a8b8155d8be548733f49bba33a65
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.