linux-kernel - [PATCH 3/4] Input: cyapa - Allow filename to be changed in update

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1363218651-22457-4-git-send-email-bleung@chromium.org>
Date:	Wed, 13 Mar 2013 16:50:50 -0700
From:	Benson Leung <bleung@...omium.org>
To:	rydberg@...omail.se, linux-input@...r.kernel.org,
	linux-kernel@...r.kernel.org, dmitry.torokhov@...il.com
Cc:	bleung@...omium.org, olofj@...omium.org, djkurtz@...omium.org,
	dudl@...ress.com
Subject: [PATCH 3/4] Input: cyapa - Allow filename to be changed in update_fw

Allow the name of the designated firmware to be passed as the
argument to update_fw from user space. This will allow user space
to specify which firmware to load.

Signed-off-by: Benson Leung <bleung@...omium.org>
---
 drivers/input/mouse/cyapa.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/input/mouse/cyapa.c b/drivers/input/mouse/cyapa.c
index e622c25..51e9d44 100644
--- a/drivers/input/mouse/cyapa.c
+++ b/drivers/input/mouse/cyapa.c
@@ -1180,9 +1180,16 @@ static ssize_t cyapa_update_fw_store(struct device *dev,
 				     const char *buf, size_t count)
 {
 	struct cyapa *cyapa = dev_get_drvdata(dev);
-	const char *fw_name = CYAPA_FW_NAME;
+	const char *fw_name;
 	int ret;
 
+	/* Do not allow paths that step out of /lib/firmware  */
+	if (strstr(buf, "../") != NULL)
+		return -EINVAL;
+
+	fw_name = !strncmp(buf, "1", count) ||
+		  !strncmp(buf, "1\n", count) ? CYAPA_FW_NAME : buf;
+
 	ret = cyapa_firmware(cyapa, fw_name);
 	if (ret)
 		dev_err(dev, "firmware update failed, %d\n", ret);
-- 
1.8.1.3

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