diff for duplicates of <4EEBC9BF.7020506@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 272c026..aba42ac 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -53,7 +53,8 @@ index 152b5b3..acd2edb 100644 @@ -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 */ @@ -94,7 +95,8 @@ index 6b39529..60ffbd0 100644 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 eaff533..0282de5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01323393883-3759-1-git-send-email-xi.wang@gmail.com\0" "From\0Xi Wang <xi.wang@gmail.com>\0" "Subject\0[PATCH v3] sctp: fix incorrect overflow check on autoclose\0" - "Date\0Fri, 16 Dec 2011 22:44:15 +0000\0" + "Date\0Fri, 16 Dec 2011 17:44:15 -0500\0" "To\0netdev@vger.kernel.org\0" "Cc\0linux-sctp@vger.kernel.org" Andrew Morton <akpm@linux-foundation.org> @@ -65,7 +65,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" @@ -106,7 +107,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" @@ -130,4 +132,4 @@ "-- \n" 1.7.5.4 -a949a078f6b65b5fcd9d5504498ed988008d582147727039044e3c5c5b6f01cb +d678ba72655524644a739aa4bdeae2484a8b6829b0f039cdaa81d07f68648840
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.