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

Commit dab6df63 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Linus Torvalds
Browse files

[PATCH] Call init_timer() for ISDN PPP CCP reset state timer 



The function isdn_ppp_ccp_reset_alloc_state() sets ->timer.function
and ->timer.data and later on calls add_timer() with no init_timer()
ever done.

Noted by Al Viro.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f2a67a57

drivers/isdn/i4l/isdn_ppp.c

+1 −0
Original line number Diff line number Diff line
@@ -2339,6 +2339,7 @@ static struct ippp_ccp_reset_state *isdn_ppp_ccp_reset_alloc_state(struct ippp_s 
		rs->state = CCPResetIdle;

		rs->is = is;

		rs->id = id;

		init_timer(&rs->timer);

		rs->timer.data = (unsigned long)rs;

		rs->timer.function = isdn_ppp_ccp_timer_callback;

		is->reset->rs[id] = rs;