[PATCH 3/5] usb: gadget: f_mass_storage: Prevent NULL pointer dereference

From: Roger Quadros
Date: Tue Apr 05 2011 - 11:35:45 EST


Prevent a NULL pointer dereference in fsg_config_from_params() if
'file' parameter is not specified.

Signed-off-by: Roger Quadros <roger.quadros@xxxxxxxxx>
---
drivers/usb/gadget/f_mass_storage.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 5d7de93..f6bd001 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -3177,7 +3177,7 @@ fsg_config_from_params(struct fsg_config *cfg,
lun->removable = /* Removable by default */
params->removable_count <= i || params->removable[i];
lun->filename =
- params->file_count > i && params->file[i][0]
+ params->file_count > i && params->file[i]
? params->file[i]
: 0;
}
--
1.6.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/