Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cdc5575 authored by Kaihui Luo's avatar Kaihui Luo Committed by David S. Miller
Browse files

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: default avatarKaihui Luo <kaih.luo@gmail.com>
Acked-by: default avatarJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 147e70e6

net/netfilter/xt_time.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

}