X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fscsi%2Fipr.c;h=17f93ee0ff46226095e6f004bf73ebf9e07f5b59;hb=df79c015fd0655b0ff4f429c89654b47367285b4;hp=fd860d952b288f3cacf6066253f4d75936e0c53e;hpb=37bef8f989ed85cdc6cf6fb9c1b1c096179b0708;p=pandora-kernel.git

diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index fd860d952b28..17f93ee0ff46 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -3736,13 +3736,17 @@ static ssize_t ipr_store_update_fw(struct device *dev,
 	struct ipr_sglist *sglist;
 	char fname[100];
 	char *src;
-	int len, result, dnld_size;
+	char *endline;
+	int result, dnld_size;
 
 	if (!capable(CAP_SYS_ADMIN))
 		return -EACCES;
 
-	len = snprintf(fname, 99, "%s", buf);
-	fname[len-1] = '\0';
+	snprintf(fname, sizeof(fname), "%s", buf);
+
+	endline = strchr(fname, '\n');
+	if (endline)
+		*endline = '\0';
 
 	if(request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) {
 		dev_err(&ioa_cfg->pdev->dev, "Firmware file %s not found\n", fname);