diff options
| author | Kaihui Luo <kaih.luo@gmail.com> | 2008-09-22 19:02:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-22 19:02:36 -0700 |
| commit | 2cdc55751c33829f00510e0104562d0f8d8a9b85 (patch) | |
| tree | 546f473942d6f0dba3d1b4dca2039073b0e20e87 | |
| parent | 147e70e62fdd5af6263106ad634b03c5154c1e56 (diff) | |
| download | linux-stable-2cdc55751c33829f00510e0104562d0f8d8a9b85.tar.gz linux-stable-2cdc55751c33829f00510e0104562d0f8d8a9b85.tar.bz2 linux-stable-2cdc55751c33829f00510e0104562d0f8d8a9b85.zip | |
netfilter: xt_time gives a wrong monthday in a leap year
The function localtime_3 in xt_time.c gives a wrong monthday in a leap
year after 28th 2. calculating monthday should use the array
days_since_leapyear[] not days_since_year[] in a leap year.
Signed-off-by: Kaihui Luo <kaih.luo@gmail.com>
Acked-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/netfilter/xt_time.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/netfilter/xt_time.c b/net/netfilter/xt_time.c index 9f328593287e..307a2c3c2df4 100644 --- a/net/netfilter/xt_time.c +++ b/net/netfilter/xt_time.c @@ -136,17 +136,19 @@ static void localtime_3(struct xtm *r, time_t time) * from w repeatedly while counting.) */ if (is_leap(year)) { + /* use days_since_leapyear[] in a leap year */ for (i = ARRAY_SIZE(days_since_leapyear) - 1; - i > 0 && days_since_year[i] > w; --i) + i > 0 && days_since_leapyear[i] > w; --i) /* just loop */; + r->monthday = w - days_since_leapyear[i] + 1; } else { for (i = ARRAY_SIZE(days_since_year) - 1; i > 0 && days_since_year[i] > w; --i) /* just loop */; + r->monthday = w - days_since_year[i] + 1; } r->month = i + 1; - r->monthday = w - days_since_year[i] + 1; return; } |