Skip to contentSkip to conversation

netfilter: xt_time gives a wrong monthday in a leap year

PATCH Applied [email protected] 3 participants 3 messages Sep 22, 2008 – Sep 24, 2008

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 2/8 netfilter: xt_time gives a wrong monthday in a leap year

From: Kaihui Luo <[email protected]>

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.

---

 net/netfilter/xt_time.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
net/netfilter/xt_time.c renamed from net/netfilter/xt_time.c~netfilter-xt_time-gives-a-wrong-monthday-in-a-leap-year +4 -2
diff -puN net/netfilter/xt_time.c~netfilter-xt_time-gives-a-wrong-monthday-in-a-leap-year 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;
 }
 

_

maintainer
#1 lore raw

From: [email protected]
Date: Mon, 22 Sep 2008 14:50:36 -0700

Quoted 9 lines

From: Kaihui Luo <[email protected]>

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.

Patrick, this seems pretty straightforward so I applied it to net-next-2.6

#2 lore raw
Quoted 9 lines · David Miller

From: [email protected]
Date: Mon, 22 Sep 2008 14:50:36 -0700

Quoted 6 lines

From: Kaihui Luo <[email protected]>

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.

Quoted 6 lines
Quoted 3 lines

Patrick, this seems pretty straightforward so I applied it to net-next-2.6

Thanks Dave.