diff for duplicates of <4F032443.40204@hp.com> diff --git a/a/1.txt b/N1/1.txt index 4fb90c3..1858883 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -62,7 +62,8 @@ P.S. Sorry, took so long. Just got back from a long vacation. > @@ -173,7 +173,7 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a > asoc->timeouts[SCTP_EVENT_TIMEOUT_HEARTBEAT] = 0; > asoc->timeouts[SCTP_EVENT_TIMEOUT_SACK] = asoc->sackdelay; -> asoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE] > - (unsigned long)sp->autoclose * HZ; +> asoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE] = +> - (unsigned long)sp->autoclose * HZ; > + min_t(unsigned long, sp->autoclose, sctp_max_autoclose) * HZ; > > /* Initializes the timers */ @@ -103,7 +104,8 @@ P.S. Sorry, took so long. Just got back from a long vacation. > static int addr_scope_max = 3; /* check sctp_scope_policy_t in include/net/sctp/constants.h for max entries */ > static int rwnd_scale_max = 16; > +static unsigned long max_autoclose_min = 0; -> +static unsigned long max_autoclose_max > + (MAX_SCHEDULE_TIMEOUT / HZ > UINT_MAX) +> +static unsigned long max_autoclose_max = +> + (MAX_SCHEDULE_TIMEOUT / HZ > UINT_MAX) > + ? UINT_MAX : MAX_SCHEDULE_TIMEOUT / HZ; > > extern long sysctl_sctp_mem[3]; diff --git a/a/content_digest b/N1/content_digest index 3dd8c2f..871a187 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\04EEBC9BF.7020506@gmail.com\0" "From\0Vladislav Yasevich <vladislav.yasevich@hp.com>\0" "Subject\0Re: [PATCH v3] sctp: fix incorrect overflow check on autoclose\0" - "Date\0Tue, 03 Jan 2012 15:52:35 +0000\0" + "Date\0Tue, 03 Jan 2012 10:52:35 -0500\0" "To\0Xi Wang <xi.wang@gmail.com>\0" "Cc\0netdev@vger.kernel.org" linux-sctp@vger.kernel.org @@ -75,7 +75,8 @@ "> @@ -173,7 +173,7 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a\n" "> \tasoc->timeouts[SCTP_EVENT_TIMEOUT_HEARTBEAT] = 0;\n" "> \tasoc->timeouts[SCTP_EVENT_TIMEOUT_SACK] = asoc->sackdelay;\n" - "> \tasoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE] > -\t\t(unsigned long)sp->autoclose * HZ;\n" + "> \tasoc->timeouts[SCTP_EVENT_TIMEOUT_AUTOCLOSE] =\n" + "> -\t\t(unsigned long)sp->autoclose * HZ;\n" "> +\t\tmin_t(unsigned long, sp->autoclose, sctp_max_autoclose) * HZ;\n" "> \n" "> \t/* Initializes the timers */\n" @@ -116,7 +117,8 @@ "> static int addr_scope_max = 3; /* check sctp_scope_policy_t in include/net/sctp/constants.h for max entries */\n" "> static int rwnd_scale_max = 16;\n" "> +static unsigned long max_autoclose_min = 0;\n" - "> +static unsigned long max_autoclose_max > +\t(MAX_SCHEDULE_TIMEOUT / HZ > UINT_MAX)\n" + "> +static unsigned long max_autoclose_max =\n" + "> +\t(MAX_SCHEDULE_TIMEOUT / HZ > UINT_MAX)\n" "> +\t? UINT_MAX : MAX_SCHEDULE_TIMEOUT / HZ;\n" "> \n" "> extern long sysctl_sctp_mem[3];\n" @@ -138,4 +140,4 @@ "> \t{ /* sentinel */ }\n" > }; -b7cbc0f45b129cd80680bd013f55d8d2e53ec9cbf91583c012e08ebc19e09e15 +c06f1e8180508d81b773850503b8eccfbe3e6631de55be524aa26604d451f7e1
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.