diff options
author | Tim Gardner <tim.gardner@canonical.com> | 2010-02-23 08:55:21 -0500 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-02-23 08:55:21 -0500 |
commit | 2c08522e5d2f0af2d6f05be558946dcbf8173683 (patch) | |
tree | b82c724797d76d29143c6b267bd006f40466f9c3 /net | |
parent | 9e2dcf72023d1447f09c47d77c99b0c49659e5ce (diff) |
netfilter: xt_recent: fix buffer overflow
e->index overflows e->stamps[] every ip_pkt_list_tot packets.
Consider the case when ip_pkt_list_tot==1; the first packet received is stored
in e->stamps[0] and e->index is initialized to 1. The next received packet
timestamp is then stored at e->stamps[1] in recent_entry_update(),
a buffer overflow because the maximum e->stamps[] index is 0.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Cc: stable@kernel.org
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/netfilter/xt_recent.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c index 132cfaa84cdc..1278f0aa7434 100644 --- a/net/netfilter/xt_recent.c +++ b/net/netfilter/xt_recent.c | |||
@@ -177,10 +177,10 @@ recent_entry_init(struct recent_table *t, const union nf_inet_addr *addr, | |||
177 | 177 | ||
178 | static void recent_entry_update(struct recent_table *t, struct recent_entry *e) | 178 | static void recent_entry_update(struct recent_table *t, struct recent_entry *e) |
179 | { | 179 | { |
180 | e->index %= ip_pkt_list_tot; | ||
180 | e->stamps[e->index++] = jiffies; | 181 | e->stamps[e->index++] = jiffies; |
181 | if (e->index > e->nstamps) | 182 | if (e->index > e->nstamps) |
182 | e->nstamps = e->index; | 183 | e->nstamps = e->index; |
183 | e->index %= ip_pkt_list_tot; | ||
184 | list_move_tail(&e->lru_list, &t->lru_list); | 184 | list_move_tail(&e->lru_list, &t->lru_list); |
185 | } | 185 | } |
186 | 186 | ||