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

Commit 33ad61d0 authored by Kees Cook's avatar Kees Cook Committed by David S. Miller
Browse files

isdn/gigaset: Provide cardstate context for bas timer callbacks 



While the work callback uses the urb to find cardstate from bas_cardstate,
this may not be valid for timer callbacks. Instead, introduce a direct
pointer back to the cardstate from bas_cardstate for use in timer
callbacks.

Reported-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Fixes: 4cfea08e ("isdn/gigaset: Convert timers to use timer_setup()")
Cc: Paul Bolle <pebolle@tiscali.nl>
Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Johan Hovold <johan@kernel.org>
Cc: gigaset307x-common@lists.sourceforge.net
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e27afb84

drivers/isdn/gigaset/bas-gigaset.c

+6 −8
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ static int start_cbsend(struct cardstate *); 


struct bas_cardstate {

	struct usb_device	*udev;		/* USB device pointer */

	struct cardstate	*cs;

	struct usb_interface	*interface;	/* interface for this device */

	unsigned char		minor;		/* starting minor number */
@@ -436,8 +437,7 @@ static void check_pending(struct bas_cardstate *ucs) 
static void cmd_in_timeout(struct timer_list *t)

{

	struct bas_cardstate *ucs = from_timer(ucs, t, timer_cmd_in);

	struct urb *urb = ucs->urb_int_in;

	struct cardstate *cs = urb->context;

	struct cardstate *cs = ucs->cs;

	int rc;



	if (!ucs->rcvbuf_size) {
@@ -643,8 +643,7 @@ static void int_in_work(struct work_struct *work) 
static void int_in_resubmit(struct timer_list *t)

{

	struct bas_cardstate *ucs = from_timer(ucs, t, timer_int_in);

	struct urb *urb = ucs->urb_int_in;

	struct cardstate *cs = urb->context;

	struct cardstate *cs = ucs->cs;

	int rc;



	if (ucs->retry_int_in++ >= BAS_RETRY) {
@@ -1446,8 +1445,7 @@ static void read_iso_tasklet(unsigned long data) 
static void req_timeout(struct timer_list *t)

{

	struct bas_cardstate *ucs = from_timer(ucs, t, timer_ctrl);

	struct urb *urb = ucs->urb_int_in;

	struct cardstate *cs = urb->context;

	struct cardstate *cs = ucs->cs;

	int pending;

	unsigned long flags;
@@ -1843,8 +1841,7 @@ static void write_command_callback(struct urb *urb) 
static void atrdy_timeout(struct timer_list *t)

{

	struct bas_cardstate *ucs = from_timer(ucs, t, timer_atrdy);

	struct urb *urb = ucs->urb_int_in;

	struct cardstate *cs = urb->context;

	struct cardstate *cs = ucs->cs;



	dev_warn(cs->dev, "timeout waiting for HD_READY_SEND_ATDATA\n");
@@ -2217,6 +2214,7 @@ static int gigaset_initcshw(struct cardstate *cs) 
	}



	spin_lock_init(&ucs->lock);

	ucs->cs = cs;

	timer_setup(&ucs->timer_ctrl, req_timeout, 0);

	timer_setup(&ucs->timer_atrdy, atrdy_timeout, 0);

	timer_setup(&ucs->timer_cmd_in, cmd_in_timeout, 0);