+ netfilter-xt_time-gives-a-wrong-monthday-in-a-leap-year.patch added to -mm tree

+ netfilter-xt_time-gives-a-wrong-monthday-in-a-leap-year.patch added to -mm tree

[akpm]

The patch titled
     netfilter: xt_time gives a wrong monthday in a leap year
has been added to the -mm tree.  Its filename is
     netfilter-xt_time-gives-a-wrong-monthday-in-a-leap-year.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: netfilter: xt_time gives a wrong monthday in a leap year
From: Kaihui Luo <kaih.luo@gmail.com>

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>
Cc: Jan Engelhardt <jengelh@computergmbh.de>
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 net/netfilter/xt_time.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff -puN net/netfilter/xt_time.c~netfilter-xt_time-gives-a-wrong-monthday-in-a-leap-year net/netfilter/xt_time.c
--- a/net/netfilter/xt_time.c~netfilter-xt_time-gives-a-wrong-monthday-in-a-leap-year
+++ a/net/netfilter/xt_time.c
@@ -136,17 +136,19 @@ static void localtime_3(struct xtm *r, t
 	 * 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;
 }
 
_

Patches currently in -mm which might be from kaih.luo@gmail.com are

netfilter-xt_time-gives-a-wrong-monthday-in-a-leap-year.patch

Re: + netfilter-xt_time-gives-a-wrong-monthday-in-a-leap-year.patch added to -mm tree

[Patrick McHardy]

akpm@linux-foundation.org wrote:
> Subject: netfilter: xt_time gives a wrong monthday in a leap year
> From: Kaihui Luo <kaih.luo@gmail.com>
> 
> 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.

Jan, do you want me to apply this patch?

Re: + netfilter-xt_time-gives-a-wrong-monthday-in-a-leap-year.patch added to -mm tree

[Jan Engelhardt]

On Monday 2008-09-01 08:06, Patrick McHardy wrote:
> akpm@linux-foundation.org wrote:
>> Subject: netfilter: xt_time gives a wrong monthday in a leap year
>> From: Kaihui Luo <kaih.luo@gmail.com>
>> 
>> 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.
>
> Jan, do you want me to apply this patch?

Acked-by: Jan Engelhardt <jengelh@medozas.de>

Re: + netfilter-xt_time-gives-a-wrong-monthday-in-a-leap-year.patch added to -mm tree

[Patrick McHardy]

Jan Engelhardt wrote:
> On Monday 2008-09-01 08:06, Patrick McHardy wrote:
>> akpm@linux-foundation.org wrote:
>>> Subject: netfilter: xt_time gives a wrong monthday in a leap year
>>> From: Kaihui Luo <kaih.luo@gmail.com>
>>>
>>> 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.
>> Jan, do you want me to apply this patch?
> 
> Acked-by: Jan Engelhardt <jengelh@medozas.de>

Applied, thanks.