diff for duplicates of <20180607182147.GD31423@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index 76e7677..fd6c83e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ On Wed, Jun 06, 2018 at 11:31:47PM +0100, Ben Hutchings wrote: > On Thu, 2018-05-24 at 11:37 +0200, Greg Kroah-Hartman wrote: -> > 4.4-stable review patch. If anyone has any objections, please let me know. +> > 4.4-stable review patch.��If anyone has any objections, please let me know. > > > > ------------------ > > @@ -17,24 +17,24 @@ On Wed, Jun 06, 2018 at 11:31:47PM +0100, Ben Hutchings wrote: > > --- a/net/sctp/associola.c > > +++ b/net/sctp/associola.c > > @@ -1000,9 +1000,10 @@ static void sctp_assoc_bh_rcv(struct wor -> > struct sctp_endpoint *ep; -> > struct sctp_chunk *chunk; -> > struct sctp_inq *inqueue; +> > � struct sctp_endpoint *ep; +> > � struct sctp_chunk *chunk; +> > � struct sctp_inq *inqueue; > > - int state; -> > sctp_subtype_t subtype; +> > � sctp_subtype_t subtype; > > + int first_time = 1; /* is this the first time through the loop */ -> > int error = 0; +> > � int error = 0; > > + int state; -> > -> > /* The association should be held so we should be safe. */ -> > ep = asoc->ep; +> > � +> > � /* The association should be held so we should be safe. */ +> > � ep = asoc->ep; > > @@ -1013,6 +1014,30 @@ static void sctp_assoc_bh_rcv(struct wor -> > state = asoc->state; -> > subtype = SCTP_ST_CHUNK(chunk->chunk_hdr->type); -> > +> > � state = asoc->state; +> > � subtype = SCTP_ST_CHUNK(chunk->chunk_hdr->type); +> > � > > + /* If the first chunk in the packet is AUTH, do special -> > + * processing specified in Section 6.3 of SCTP-AUTH spec -> > + */ +> > + �* processing specified in Section 6.3 of SCTP-AUTH spec +> > + �*/ > > + if (first_time && subtype.chunk == SCTP_CID_AUTH) { > > + struct sctp_chunkhdr *next_hdr; > > + @@ -43,13 +43,13 @@ On Wed, Jun 06, 2018 at 11:31:47PM +0100, Ben Hutchings wrote: > > + goto normal; > > + > > + /* If the next chunk is COOKIE-ECHO, skip the AUTH -> > + * chunk while saving a pointer to it so we can do -> > + * Authentication later (during cookie-echo -> > + * processing). -> > + */ +> > + �* chunk while saving a pointer to it so we can do +> > + �* Authentication later (during cookie-echo +> > + �* processing). +> > + �*/ > > + if (next_hdr->type == SCTP_CID_COOKIE_ECHO) { > > + chunk->auth_chunk = skb_clone(chunk->skb, -> > + GFP_ATOMIC); +> > + ������GFP_ATOMIC); > > + chunk->auth = 1; > > Doesn't the first_time flag need to be cleared here (and before the @@ -79,6 +79,6 @@ Thanks for reviewing this, btw. > [...] > > -- -> Ben Hutchings, Software Developer Codethink Ltd +> Ben Hutchings, Software Developer � Codethink Ltd > https://www.codethink.co.uk/ Dale House, 35 Dale Street > Manchester, M1 2HF, United Kingdom diff --git a/a/content_digest b/N1/content_digest index e24152f..53702a8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -15,7 +15,7 @@ "b\0" "On Wed, Jun 06, 2018 at 11:31:47PM +0100, Ben Hutchings wrote:\n" "> On Thu, 2018-05-24 at 11:37 +0200, Greg Kroah-Hartman wrote:\n" - "> > 4.4-stable review patch.\302\240\302\240If anyone has any objections, please let me know.\n" + "> > 4.4-stable review patch.\303\257\302\277\302\275\303\257\302\277\302\275If anyone has any objections, please let me know.\n" "> > \n" "> > ------------------\n" "> > \n" @@ -32,24 +32,24 @@ "> > --- a/net/sctp/associola.c\n" "> > +++ b/net/sctp/associola.c\n" "> > @@ -1000,9 +1000,10 @@ static void sctp_assoc_bh_rcv(struct wor\n" - "> > \302\240\tstruct sctp_endpoint *ep;\n" - "> > \302\240\tstruct sctp_chunk *chunk;\n" - "> > \302\240\tstruct sctp_inq *inqueue;\n" + "> > \303\257\302\277\302\275\tstruct sctp_endpoint *ep;\n" + "> > \303\257\302\277\302\275\tstruct sctp_chunk *chunk;\n" + "> > \303\257\302\277\302\275\tstruct sctp_inq *inqueue;\n" "> > -\tint state;\n" - "> > \302\240\tsctp_subtype_t subtype;\n" + "> > \303\257\302\277\302\275\tsctp_subtype_t subtype;\n" "> > +\tint first_time = 1;\t/* is this the first time through the loop */\n" - "> > \302\240\tint error = 0;\n" + "> > \303\257\302\277\302\275\tint error = 0;\n" "> > +\tint state;\n" - "> > \302\240\n" - "> > \302\240\t/* The association should be held so we should be safe. */\n" - "> > \302\240\tep = asoc->ep;\n" + "> > \303\257\302\277\302\275\n" + "> > \303\257\302\277\302\275\t/* The association should be held so we should be safe. */\n" + "> > \303\257\302\277\302\275\tep = asoc->ep;\n" "> > @@ -1013,6 +1014,30 @@ static void sctp_assoc_bh_rcv(struct wor\n" - "> > \302\240\t\tstate = asoc->state;\n" - "> > \302\240\t\tsubtype = SCTP_ST_CHUNK(chunk->chunk_hdr->type);\n" - "> > \302\240\n" + "> > \303\257\302\277\302\275\t\tstate = asoc->state;\n" + "> > \303\257\302\277\302\275\t\tsubtype = SCTP_ST_CHUNK(chunk->chunk_hdr->type);\n" + "> > \303\257\302\277\302\275\n" "> > +\t\t/* If the first chunk in the packet is AUTH, do special\n" - "> > +\t\t\302\240* processing specified in Section 6.3 of SCTP-AUTH spec\n" - "> > +\t\t\302\240*/\n" + "> > +\t\t\303\257\302\277\302\275* processing specified in Section 6.3 of SCTP-AUTH spec\n" + "> > +\t\t\303\257\302\277\302\275*/\n" "> > +\t\tif (first_time && subtype.chunk == SCTP_CID_AUTH) {\n" "> > +\t\t\tstruct sctp_chunkhdr *next_hdr;\n" "> > +\n" @@ -58,13 +58,13 @@ "> > +\t\t\t\tgoto normal;\n" "> > +\n" "> > +\t\t\t/* If the next chunk is COOKIE-ECHO, skip the AUTH\n" - "> > +\t\t\t\302\240* chunk while saving a pointer to it so we can do\n" - "> > +\t\t\t\302\240* Authentication later (during cookie-echo\n" - "> > +\t\t\t\302\240* processing).\n" - "> > +\t\t\t\302\240*/\n" + "> > +\t\t\t\303\257\302\277\302\275* chunk while saving a pointer to it so we can do\n" + "> > +\t\t\t\303\257\302\277\302\275* Authentication later (during cookie-echo\n" + "> > +\t\t\t\303\257\302\277\302\275* processing).\n" + "> > +\t\t\t\303\257\302\277\302\275*/\n" "> > +\t\t\tif (next_hdr->type == SCTP_CID_COOKIE_ECHO) {\n" "> > +\t\t\t\tchunk->auth_chunk = skb_clone(chunk->skb,\n" - "> > +\t\t\t\t\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240GFP_ATOMIC);\n" + "> > +\t\t\t\t\t\t\t\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275GFP_ATOMIC);\n" "> > +\t\t\t\tchunk->auth = 1;\n" "> \n" "> Doesn't the first_time flag need to be cleared here (and before the\n" @@ -94,8 +94,8 @@ "> [...]\n" "> \n" "> -- \n" - "> Ben Hutchings, Software Developer \302\240 Codethink Ltd\n" + "> Ben Hutchings, Software Developer \303\257\302\277\302\275 Codethink Ltd\n" "> https://www.codethink.co.uk/ Dale House, 35 Dale Street\n" > Manchester, M1 2HF, United Kingdom -9b8689d61aed3fea3402b4f9e2a8823ef78ddcfed1a24f865061e66e149eeb8d +dfa48b4ef68871690f79a50bbe0a468b64237e2e963f7de4e965fdbb46562473
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.