Skip to content

Commit

Permalink
dvb-usb: move data_mutex to struct dvb_usb_device
Browse files Browse the repository at this point in the history 
The data_mutex is initialized too late, as it is needed for
each device driver's power control, causing an OOPS:

    dvb-usb: found a 'TerraTec/qanu USB2.0 Highspeed DVB-T Receiver' in warm state.
    BUG: unable to handle kernel NULL pointer dereference at           (null)
    IP: [<ffffffff846617af>] __mutex_lock_slowpath+0x6f/0x100 PGD 0
    Oops: 0002 [#1] SMP
    Modules linked in: dvb_usb_cinergyT2(+) dvb_usb
    CPU: 0 PID: 2029 Comm: modprobe Not tainted 4.9.0-rc4-dvbmod #24
    Hardware name: FUJITSU LIFEBOOK A544/FJNBB35 , BIOS Version 1.17 05/09/2014
    task: ffff88020e943840 task.stack: ffff8801f36ec000
    RIP: 0010:[<ffffffff846617af>]  [<ffffffff846617af>] __mutex_lock_slowpath+0x6f/0x100
    RSP: 0018:ffff8801f36efb10  EFLAGS: 00010282
    RAX: 0000000000000000 RBX: ffff88021509bdc8 RCX: 00000000c0000100
    RDX: 0000000000000001 RSI: 0000000000000000 RDI: ffff88021509bdcc
    RBP: ffff8801f36efb58 R08: ffff88021f216320 R09: 0000000000100000
    R10: ffff88021f216320 R11: 00000023fee6c5a1 R12: ffff88020e943840
    R13: ffff88021509bdcc R14: 00000000ffffffff R15: ffff88021509bdd0
    FS:  00007f21adb86740(0000) GS:ffff88021f200000(0000) knlGS:0000000000000000
    CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
    CR2: 0000000000000000 CR3: 0000000215bce000 CR4: 00000000001406f0
    Call Trace:
       mutex_lock+0x16/0x25
       cinergyt2_power_ctrl+0x1f/0x60 [dvb_usb_cinergyT2]
       dvb_usb_device_init+0x21e/0x5d0 [dvb_usb]
       cinergyt2_usb_probe+0x21/0x50 [dvb_usb_cinergyT2]
       usb_probe_interface+0xf3/0x2a0
       driver_probe_device+0x208/0x2b0
       __driver_attach+0x87/0x90
       driver_probe_device+0x2b0/0x2b0
       bus_for_each_dev+0x52/0x80
       bus_add_driver+0x1a3/0x220
       driver_register+0x56/0xd0
       usb_register_driver+0x77/0x130
       do_one_initcall+0x46/0x180
       free_vmap_area_noflush+0x38/0x70
       kmem_cache_alloc+0x84/0xc0
       do_init_module+0x50/0x1be
       load_module+0x1d8b/0x2100
       find_symbol_in_section+0xa0/0xa0
       SyS_finit_module+0x89/0x90
       entry_SYSCALL_64_fastpath+0x13/0x94
    Code: e8 a7 1d 00 00 8b 03 83 f8 01 0f 84 97 00 00 00 48 8b 43 10 4c 8d 7b 08 48 89 63 10 4c 89 3c 24 41 be ff ff ff ff 48 89 44 24 08 <48> 89 20 4c 89 64 24 10 eb 1a 49 c7 44 24 08 02 00 00 00 c6 43 RIP  [<ffffffff846617af>] __mutex_lock_slowpath+0x6f/0x100 RSP <ffff8801f36efb10>
    CR2: 0000000000000000

So, move it to the struct dvb_usb_device and initialize it
before calling the driver's callbacks.

Reported-by: Jörg Otte <[email protected]>
Tested-by: Jörg Otte <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
@mchehab @torvalds
mchehab authored and torvalds committed Nov 13, 2016
1 parent 86e4ee7 commit 7724325
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 95 deletions.
33 changes: 10 additions & 23 deletions drivers/media/usb/dvb-usb/af9005.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ struct af9005_device_state {
u8 sequence;
int led_state;
unsigned char data[256];
struct mutex data_mutex;
};

static int af9005_generic_read_write(struct dvb_usb_device *d, u16 reg,
Expand All @@ -72,7 +71,7 @@ static int af9005_generic_read_write(struct dvb_usb_device *d, u16 reg,
return -EINVAL;
}

mutex_lock(&st->data_mutex);
mutex_lock(&d->data_mutex);
st->data[0] = 14; /* rest of buffer length low */
st->data[1] = 0; /* rest of buffer length high */

Expand Down Expand Up @@ -140,7 +139,7 @@ static int af9005_generic_read_write(struct dvb_usb_device *d, u16 reg,
values[i] = st->data[8 + i];

ret:
mutex_unlock(&st->data_mutex);
mutex_unlock(&d->data_mutex);
return ret;

}
Expand Down Expand Up @@ -481,7 +480,7 @@ int af9005_send_command(struct dvb_usb_device *d, u8 command, u8 * wbuf,
}
packet_len = wlen + 5;

mutex_lock(&st->data_mutex);
mutex_lock(&d->data_mutex);

st->data[0] = (u8) (packet_len & 0xff);
st->data[1] = (u8) ((packet_len & 0xff00) >> 8);
Expand Down Expand Up @@ -512,7 +511,7 @@ int af9005_send_command(struct dvb_usb_device *d, u8 command, u8 * wbuf,
rbuf[i] = st->data[i + 7];
}

mutex_unlock(&st->data_mutex);
mutex_unlock(&d->data_mutex);
return ret;
}

Expand All @@ -523,7 +522,7 @@ int af9005_read_eeprom(struct dvb_usb_device *d, u8 address, u8 * values,
u8 seq;
int ret, i;

mutex_lock(&st->data_mutex);
mutex_lock(&d->data_mutex);

memset(st->data, 0, sizeof(st->data));

Expand Down Expand Up @@ -559,7 +558,7 @@ int af9005_read_eeprom(struct dvb_usb_device *d, u8 address, u8 * values,
for (i = 0; i < len; i++)
values[i] = st->data[6 + i];
}
mutex_unlock(&st->data_mutex);
mutex_unlock(&d->data_mutex);

return ret;
}
Expand Down Expand Up @@ -847,7 +846,7 @@ static int af9005_rc_query(struct dvb_usb_device *d, u32 * event, int *state)
return 0;
}

mutex_lock(&st->data_mutex);
mutex_lock(&d->data_mutex);

/* deb_info("rc_query\n"); */
st->data[0] = 3; /* rest of packet length low */
Expand Down Expand Up @@ -890,7 +889,7 @@ static int af9005_rc_query(struct dvb_usb_device *d, u32 * event, int *state)
}

ret:
mutex_unlock(&st->data_mutex);
mutex_unlock(&d->data_mutex);
return ret;
}

Expand Down Expand Up @@ -1004,20 +1003,8 @@ static struct dvb_usb_device_properties af9005_properties;
static int af9005_usb_probe(struct usb_interface *intf,
const struct usb_device_id *id)
{
struct dvb_usb_device *d;
struct af9005_device_state *st;
int ret;

ret = dvb_usb_device_init(intf, &af9005_properties,
THIS_MODULE, &d, adapter_nr);

if (ret < 0)
return ret;

st = d->priv;
mutex_init(&st->data_mutex);

return 0;
return dvb_usb_device_init(intf, &af9005_properties,
THIS_MODULE, NULL, adapter_nr);
}

enum af9005_usb_table_entry {
Expand Down
33 changes: 10 additions & 23 deletions drivers/media/usb/dvb-usb/cinergyT2-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
struct cinergyt2_state {
u8 rc_counter;
unsigned char data[64];
struct mutex data_mutex;
};

/* We are missing a release hook with usb_device data */
Expand All @@ -56,12 +55,12 @@ static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
struct cinergyt2_state *st = d->priv;
int ret;

mutex_lock(&st->data_mutex);
mutex_lock(&d->data_mutex);
st->data[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
st->data[1] = enable ? 1 : 0;

ret = dvb_usb_generic_rw(d, st->data, 2, st->data, 64, 0);
mutex_unlock(&st->data_mutex);
mutex_unlock(&d->data_mutex);

return ret;
}
Expand All @@ -71,12 +70,12 @@ static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
struct cinergyt2_state *st = d->priv;
int ret;

mutex_lock(&st->data_mutex);
mutex_lock(&d->data_mutex);
st->data[0] = CINERGYT2_EP1_SLEEP_MODE;
st->data[1] = enable ? 0 : 1;

ret = dvb_usb_generic_rw(d, st->data, 2, st->data, 3, 0);
mutex_unlock(&st->data_mutex);
mutex_unlock(&d->data_mutex);

return ret;
}
Expand All @@ -89,15 +88,15 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)

adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);

mutex_lock(&st->data_mutex);
mutex_lock(&d->data_mutex);
st->data[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;

ret = dvb_usb_generic_rw(d, st->data, 1, st->data, 3, 0);
if (ret < 0) {
deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
"state info\n");
}
mutex_unlock(&st->data_mutex);
mutex_unlock(&d->data_mutex);

/* Copy this pointer as we are gonna need it in the release phase */
cinergyt2_usb_device = adap->dev;
Expand Down Expand Up @@ -166,7 +165,7 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)

*state = REMOTE_NO_KEY_PRESSED;

mutex_lock(&st->data_mutex);
mutex_lock(&d->data_mutex);
st->data[0] = CINERGYT2_EP1_GET_RC_EVENTS;

ret = dvb_usb_generic_rw(d, st->data, 1, st->data, 5, 0);
Expand Down Expand Up @@ -202,29 +201,17 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
}

ret:
mutex_unlock(&st->data_mutex);
mutex_unlock(&d->data_mutex);
return ret;
}

static int cinergyt2_usb_probe(struct usb_interface *intf,
const struct usb_device_id *id)
{
struct dvb_usb_device *d;
struct cinergyt2_state *st;
int ret;

ret = dvb_usb_device_init(intf, &cinergyt2_properties,
THIS_MODULE, &d, adapter_nr);
if (ret < 0)
return ret;

st = d->priv;
mutex_init(&st->data_mutex);

return 0;
return dvb_usb_device_init(intf, &cinergyt2_properties,
THIS_MODULE, NULL, adapter_nr);
}


static struct usb_device_id cinergyt2_usb_table[] = {
{ USB_DEVICE(USB_VID_TERRATEC, 0x0038) },
{ 0 }
Expand Down
39 changes: 16 additions & 23 deletions drivers/media/usb/dvb-usb/cxusb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ static int cxusb_ctrl_msg(struct dvb_usb_device *d,

wo = (rbuf == NULL || rlen == 0); /* write-only */

mutex_lock(&st->data_mutex);
mutex_lock(&d->data_mutex);
st->data[0] = cmd;
memcpy(&st->data[1], wbuf, wlen);
if (wo)
Expand All @@ -77,7 +77,7 @@ static int cxusb_ctrl_msg(struct dvb_usb_device *d,
ret = dvb_usb_generic_rw(d, st->data, 1 + wlen,
rbuf, rlen, 0);

mutex_unlock(&st->data_mutex);
mutex_unlock(&d->data_mutex);
return ret;
}

Expand Down Expand Up @@ -1461,43 +1461,36 @@ static struct dvb_usb_device_properties cxusb_mygica_t230_properties;
static int cxusb_probe(struct usb_interface *intf,
const struct usb_device_id *id)
{
struct dvb_usb_device *d;
struct cxusb_state *st;

if (0 == dvb_usb_device_init(intf, &cxusb_medion_properties,
THIS_MODULE, &d, adapter_nr) ||
THIS_MODULE, NULL, adapter_nr) ||
0 == dvb_usb_device_init(intf, &cxusb_bluebird_lgh064f_properties,
THIS_MODULE, &d, adapter_nr) ||
THIS_MODULE, NULL, adapter_nr) ||
0 == dvb_usb_device_init(intf, &cxusb_bluebird_dee1601_properties,
THIS_MODULE, &d, adapter_nr) ||
THIS_MODULE, NULL, adapter_nr) ||
0 == dvb_usb_device_init(intf, &cxusb_bluebird_lgz201_properties,
THIS_MODULE, &d, adapter_nr) ||
THIS_MODULE, NULL, adapter_nr) ||
0 == dvb_usb_device_init(intf, &cxusb_bluebird_dtt7579_properties,
THIS_MODULE, &d, adapter_nr) ||
THIS_MODULE, NULL, adapter_nr) ||
0 == dvb_usb_device_init(intf, &cxusb_bluebird_dualdig4_properties,
THIS_MODULE, &d, adapter_nr) ||
THIS_MODULE, NULL, adapter_nr) ||
0 == dvb_usb_device_init(intf, &cxusb_bluebird_nano2_properties,
THIS_MODULE, &d, adapter_nr) ||
THIS_MODULE, NULL, adapter_nr) ||
0 == dvb_usb_device_init(intf,
&cxusb_bluebird_nano2_needsfirmware_properties,
THIS_MODULE, &d, adapter_nr) ||
THIS_MODULE, NULL, adapter_nr) ||
0 == dvb_usb_device_init(intf, &cxusb_aver_a868r_properties,
THIS_MODULE, &d, adapter_nr) ||
THIS_MODULE, NULL, adapter_nr) ||
0 == dvb_usb_device_init(intf,
&cxusb_bluebird_dualdig4_rev2_properties,
THIS_MODULE, &d, adapter_nr) ||
THIS_MODULE, NULL, adapter_nr) ||
0 == dvb_usb_device_init(intf, &cxusb_d680_dmb_properties,
THIS_MODULE, &d, adapter_nr) ||
THIS_MODULE, NULL, adapter_nr) ||
0 == dvb_usb_device_init(intf, &cxusb_mygica_d689_properties,
THIS_MODULE, &d, adapter_nr) ||
THIS_MODULE, NULL, adapter_nr) ||
0 == dvb_usb_device_init(intf, &cxusb_mygica_t230_properties,
THIS_MODULE, &d, adapter_nr) ||
0) {
st = d->priv;
mutex_init(&st->data_mutex);

THIS_MODULE, NULL, adapter_nr) ||
0)
return 0;
}

return -EINVAL;
}
Expand Down
1 change: 0 additions & 1 deletion drivers/media/usb/dvb-usb/cxusb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ struct cxusb_state {
struct i2c_client *i2c_client_tuner;

unsigned char data[MAX_XFER_SIZE];
struct mutex data_mutex;
};

#endif
Loading

0 comments on commit 7724325

Please sign in to comment.