diff for duplicates of <20171024084531.GA23722@beast> diff --git a/a/1.txt b/N1/1.txt index 392dd93..45e2926 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -96,7 +96,8 @@ index 402bfbb888cd..1c2699b424af 100644 +void sctp_generate_t3_rtx_event(struct timer_list *t) { - struct sctp_transport *transport = (struct sctp_transport *) peer; -+ struct sctp_transport *transport + from_timer(transport, t, T3_rtx_timer); ++ struct sctp_transport *transport = ++ from_timer(transport, t, T3_rtx_timer); struct sctp_association *asoc = transport->asoc; struct sock *sk = asoc->base.sk; struct net *net = sock_net(sk); @@ -108,7 +109,8 @@ index 402bfbb888cd..1c2699b424af 100644 +static void sctp_generate_t1_cookie_event(struct timer_list *t) { - struct sctp_association *asoc = (struct sctp_association *) data; -+ struct sctp_association *asoc + from_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_T1_COOKIE]); ++ struct sctp_association *asoc = ++ from_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_T1_COOKIE]); + sctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_T1_COOKIE); } @@ -117,7 +119,8 @@ index 402bfbb888cd..1c2699b424af 100644 +static void sctp_generate_t1_init_event(struct timer_list *t) { - struct sctp_association *asoc = (struct sctp_association *) data; -+ struct sctp_association *asoc + from_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_T1_INIT]); ++ struct sctp_association *asoc = ++ from_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_T1_INIT]); + sctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_T1_INIT); } @@ -126,7 +129,8 @@ index 402bfbb888cd..1c2699b424af 100644 +static void sctp_generate_t2_shutdown_event(struct timer_list *t) { - struct sctp_association *asoc = (struct sctp_association *) data; -+ struct sctp_association *asoc + from_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_T2_SHUTDOWN]); ++ struct sctp_association *asoc = ++ from_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_T2_SHUTDOWN]); + sctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_T2_SHUTDOWN); } @@ -135,7 +139,8 @@ index 402bfbb888cd..1c2699b424af 100644 +static void sctp_generate_t4_rto_event(struct timer_list *t) { - struct sctp_association *asoc = (struct sctp_association *) data; -+ struct sctp_association *asoc + from_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_T4_RTO]); ++ struct sctp_association *asoc = ++ from_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_T4_RTO]); + sctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_T4_RTO); } @@ -144,7 +149,8 @@ index 402bfbb888cd..1c2699b424af 100644 +static void sctp_generate_t5_shutdown_guard_event(struct timer_list *t) { - struct sctp_association *asoc = (struct sctp_association *)data; -+ struct sctp_association *asoc + from_timer(asoc, t, ++ struct sctp_association *asoc = ++ from_timer(asoc, t, + timers[SCTP_EVENT_TIMEOUT_T5_SHUTDOWN_GUARD]); + sctp_generate_timeout_event(asoc, @@ -156,7 +162,8 @@ index 402bfbb888cd..1c2699b424af 100644 +static void sctp_generate_autoclose_event(struct timer_list *t) { - struct sctp_association *asoc = (struct sctp_association *) data; -+ struct sctp_association *asoc + from_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_AUTOCLOSE]); ++ struct sctp_association *asoc = ++ from_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_AUTOCLOSE]); + sctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_AUTOCLOSE); } @@ -180,7 +187,8 @@ index 402bfbb888cd..1c2699b424af 100644 +void sctp_generate_proto_unreach_event(struct timer_list *t) { - struct sctp_transport *transport = (struct sctp_transport *)data; -+ struct sctp_transport *transport + from_timer(transport, t, proto_unreach_timer); ++ struct sctp_transport *transport = ++ from_timer(transport, t, proto_unreach_timer); struct sctp_association *asoc = transport->asoc; struct sock *sk = asoc->base.sk; struct net *net = sock_net(sk); @@ -192,7 +200,8 @@ index 402bfbb888cd..1c2699b424af 100644 +void sctp_generate_reconf_event(struct timer_list *t) { - struct sctp_transport *transport = (struct sctp_transport *)data; -+ struct sctp_transport *transport + from_timer(transport, t, reconf_timer); ++ struct sctp_transport *transport = ++ from_timer(transport, t, reconf_timer); struct sctp_association *asoc = transport->asoc; struct sock *sk = asoc->base.sk; struct net *net = sock_net(sk); @@ -204,7 +213,8 @@ index 402bfbb888cd..1c2699b424af 100644 +static void sctp_generate_sack_event(struct timer_list *t) { - struct sctp_association *asoc = (struct sctp_association *)data; -+ struct sctp_association *asoc + from_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_SACK]); ++ struct sctp_association *asoc = ++ from_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_SACK]); + sctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_SACK); } @@ -227,7 +237,8 @@ index 402bfbb888cd..1c2699b424af 100644 + [SCTP_EVENT_TIMEOUT_T2_SHUTDOWN] = sctp_generate_t2_shutdown_event, + [SCTP_EVENT_TIMEOUT_T3_RTX] = NULL, + [SCTP_EVENT_TIMEOUT_T4_RTO] = sctp_generate_t4_rto_event, -+ [SCTP_EVENT_TIMEOUT_T5_SHUTDOWN_GUARD] + sctp_generate_t5_shutdown_guard_event, ++ [SCTP_EVENT_TIMEOUT_T5_SHUTDOWN_GUARD] = ++ sctp_generate_t5_shutdown_guard_event, + [SCTP_EVENT_TIMEOUT_HEARTBEAT] = NULL, + [SCTP_EVENT_TIMEOUT_RECONF] = NULL, + [SCTP_EVENT_TIMEOUT_SACK] = sctp_generate_sack_event, diff --git a/a/content_digest b/N1/content_digest index 29baa07..fbc7d40 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Kees Cook <keescook@chromium.org>\0" "Subject\0[PATCH] net: sctp: Convert timers to use timer_setup()\0" - "Date\0Tue, 24 Oct 2017 08:45:31 +0000\0" + "Date\0Tue, 24 Oct 2017 01:45:31 -0700\0" "To\0David S. Miller <davem@davemloft.net>\0" "Cc\0Vlad Yasevich <vyasevich@gmail.com>" Neil Horman <nhorman@tuxdriver.com> @@ -107,7 +107,8 @@ "+void sctp_generate_t3_rtx_event(struct timer_list *t)\n" " {\n" "-\tstruct sctp_transport *transport = (struct sctp_transport *) peer;\n" - "+\tstruct sctp_transport *transport +\t\tfrom_timer(transport, t, T3_rtx_timer);\n" + "+\tstruct sctp_transport *transport =\n" + "+\t\tfrom_timer(transport, t, T3_rtx_timer);\n" " \tstruct sctp_association *asoc = transport->asoc;\n" " \tstruct sock *sk = asoc->base.sk;\n" " \tstruct net *net = sock_net(sk);\n" @@ -119,7 +120,8 @@ "+static void sctp_generate_t1_cookie_event(struct timer_list *t)\n" " {\n" "-\tstruct sctp_association *asoc = (struct sctp_association *) data;\n" - "+\tstruct sctp_association *asoc +\t\tfrom_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_T1_COOKIE]);\n" + "+\tstruct sctp_association *asoc =\n" + "+\t\tfrom_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_T1_COOKIE]);\n" "+\n" " \tsctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_T1_COOKIE);\n" " }\n" @@ -128,7 +130,8 @@ "+static void sctp_generate_t1_init_event(struct timer_list *t)\n" " {\n" "-\tstruct sctp_association *asoc = (struct sctp_association *) data;\n" - "+\tstruct sctp_association *asoc +\t\tfrom_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_T1_INIT]);\n" + "+\tstruct sctp_association *asoc =\n" + "+\t\tfrom_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_T1_INIT]);\n" "+\n" " \tsctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_T1_INIT);\n" " }\n" @@ -137,7 +140,8 @@ "+static void sctp_generate_t2_shutdown_event(struct timer_list *t)\n" " {\n" "-\tstruct sctp_association *asoc = (struct sctp_association *) data;\n" - "+\tstruct sctp_association *asoc +\t\tfrom_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_T2_SHUTDOWN]);\n" + "+\tstruct sctp_association *asoc =\n" + "+\t\tfrom_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_T2_SHUTDOWN]);\n" "+\n" " \tsctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_T2_SHUTDOWN);\n" " }\n" @@ -146,7 +150,8 @@ "+static void sctp_generate_t4_rto_event(struct timer_list *t)\n" " {\n" "-\tstruct sctp_association *asoc = (struct sctp_association *) data;\n" - "+\tstruct sctp_association *asoc +\t\tfrom_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_T4_RTO]);\n" + "+\tstruct sctp_association *asoc =\n" + "+\t\tfrom_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_T4_RTO]);\n" "+\n" " \tsctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_T4_RTO);\n" " }\n" @@ -155,7 +160,8 @@ "+static void sctp_generate_t5_shutdown_guard_event(struct timer_list *t)\n" " {\n" "-\tstruct sctp_association *asoc = (struct sctp_association *)data;\n" - "+\tstruct sctp_association *asoc +\t\tfrom_timer(asoc, t,\n" + "+\tstruct sctp_association *asoc =\n" + "+\t\tfrom_timer(asoc, t,\n" "+\t\t\t timers[SCTP_EVENT_TIMEOUT_T5_SHUTDOWN_GUARD]);\n" "+\n" " \tsctp_generate_timeout_event(asoc,\n" @@ -167,7 +173,8 @@ "+static void sctp_generate_autoclose_event(struct timer_list *t)\n" " {\n" "-\tstruct sctp_association *asoc = (struct sctp_association *) data;\n" - "+\tstruct sctp_association *asoc +\t\tfrom_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_AUTOCLOSE]);\n" + "+\tstruct sctp_association *asoc =\n" + "+\t\tfrom_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_AUTOCLOSE]);\n" "+\n" " \tsctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_AUTOCLOSE);\n" " }\n" @@ -191,7 +198,8 @@ "+void sctp_generate_proto_unreach_event(struct timer_list *t)\n" " {\n" "-\tstruct sctp_transport *transport = (struct sctp_transport *)data;\n" - "+\tstruct sctp_transport *transport +\t\tfrom_timer(transport, t, proto_unreach_timer);\n" + "+\tstruct sctp_transport *transport =\n" + "+\t\tfrom_timer(transport, t, proto_unreach_timer);\n" " \tstruct sctp_association *asoc = transport->asoc;\n" " \tstruct sock *sk = asoc->base.sk;\n" " \tstruct net *net = sock_net(sk);\n" @@ -203,7 +211,8 @@ "+void sctp_generate_reconf_event(struct timer_list *t)\n" " {\n" "-\tstruct sctp_transport *transport = (struct sctp_transport *)data;\n" - "+\tstruct sctp_transport *transport +\t\tfrom_timer(transport, t, reconf_timer);\n" + "+\tstruct sctp_transport *transport =\n" + "+\t\tfrom_timer(transport, t, reconf_timer);\n" " \tstruct sctp_association *asoc = transport->asoc;\n" " \tstruct sock *sk = asoc->base.sk;\n" " \tstruct net *net = sock_net(sk);\n" @@ -215,7 +224,8 @@ "+static void sctp_generate_sack_event(struct timer_list *t)\n" " {\n" "-\tstruct sctp_association *asoc = (struct sctp_association *)data;\n" - "+\tstruct sctp_association *asoc +\t\tfrom_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_SACK]);\n" + "+\tstruct sctp_association *asoc =\n" + "+\t\tfrom_timer(asoc, t, timers[SCTP_EVENT_TIMEOUT_SACK]);\n" "+\n" " \tsctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_SACK);\n" " }\n" @@ -238,7 +248,8 @@ "+\t[SCTP_EVENT_TIMEOUT_T2_SHUTDOWN] =\tsctp_generate_t2_shutdown_event,\n" "+\t[SCTP_EVENT_TIMEOUT_T3_RTX] =\t\tNULL,\n" "+\t[SCTP_EVENT_TIMEOUT_T4_RTO] =\t\tsctp_generate_t4_rto_event,\n" - "+\t[SCTP_EVENT_TIMEOUT_T5_SHUTDOWN_GUARD] +\t\t\t\t\tsctp_generate_t5_shutdown_guard_event,\n" + "+\t[SCTP_EVENT_TIMEOUT_T5_SHUTDOWN_GUARD] =\n" + "+\t\t\t\t\tsctp_generate_t5_shutdown_guard_event,\n" "+\t[SCTP_EVENT_TIMEOUT_HEARTBEAT] =\tNULL,\n" "+\t[SCTP_EVENT_TIMEOUT_RECONF] =\t\tNULL,\n" "+\t[SCTP_EVENT_TIMEOUT_SACK] =\t\tsctp_generate_sack_event,\n" @@ -278,4 +289,4 @@ "Kees Cook\n" Pixel Security -d712a38bae3a3d8c66cac4ba4a7c2500b35cbad8cba7405e7cc0d07036ae7eea +ce96484d223d418edecd5c0b45a637d01c8ed9725439ef97543beb9241e115cf
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.