diff options
| author | Mayank Rana <mrana@codeaurora.org> | 2016-03-02 14:56:23 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:48:12 -0700 |
| commit | 06a8a7d33a9dc9e8059a02c2baf66ccddca2284e (patch) | |
| tree | b61056b4bf69275ec4a8cf1a79ff10d1f4d41a92 /drivers/usb | |
| parent | cb8b39f6318241d8461456dfb2c39260be368d05 (diff) | |
usb: gadget: f_diag: Fix check to update dload cookie
This change update dload cookie if cdev->desc.iSerialNumber is already
available instead of trying to get string descriptors. It also adds
check against possibility of string descriptors being NULL to avoid
device crash.
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/function/f_diag.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_diag.c b/drivers/usb/gadget/function/f_diag.c index f89f81b4dfc9..4210f77a6245 100644 --- a/drivers/usb/gadget/function/f_diag.c +++ b/drivers/usb/gadget/function/f_diag.c @@ -225,13 +225,17 @@ static void diag_update_pid_and_serial_num(struct diag_context *ctxt) local_diag_dload.pid = cdev->desc.idProduct; /* pass on product id and serial number to dload */ - if (cdev->desc.iSerialNumber) { + if (!cdev->desc.iSerialNumber) { /* * Serial number is filled by the composite driver. So * it is fair enough to assume that it will always be * found at first table of strings. */ table = *(cdev->driver->strings); + if (!table) { + pr_err("%s: can't update dload cookie\n", __func__); + return; + } for (s = table->strings; s && s->s; s++) { if (s->id == cdev->desc.iSerialNumber) { local_diag_dload.magic_struct.serial_num = |