[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20131206214959.125240499@linuxfoundation.org>
Date:	Fri,  6 Dec 2013 13:52:35 -0800
From:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:	linux-kernel@...r.kernel.org
Cc:	Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
	stable@...r.kernel.org, Kees Cook <keescook@...omium.org>,
	Bruno Prémont <bonbons@...ux-vserver.org>,
	Jiri Kosina <jkosina@...e.cz>,
	Kefeng Wang <wangkefeng.wang@...wei.com>, stable@...nel.org
Subject: [PATCH 3.4 25/32] HID: picolcd_core: validate output report details
3.4-stable review patch.  If anyone has any objections, please let me know.
------------------
From: Kees Cook <keescook@...omium.org>
commit 1e87a2456b0227ca4ab881e19a11bb99d164e792 upstream.
A HID device could send a malicious output report that would cause the
picolcd HID driver to trigger a NULL dereference during attr file writing.
[jkosina@...e.cz: changed
	report->maxfield < 1
to
	report->maxfield != 1
as suggested by Bruno].
CVE-2013-2899
Signed-off-by: Kees Cook <keescook@...omium.org>
Cc: stable@...nel.org
Reviewed-by: Bruno Prémont <bonbons@...ux-vserver.org>
Acked-by: Bruno Prémont <bonbons@...ux-vserver.org>
Signed-off-by: Jiri Kosina <jkosina@...e.cz>
[Kefeng: backported to stable 3.4: adjust filename]
Signed-off-by: Kefeng Wang <wangkefeng.wang@...wei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
 drivers/hid/hid-picolcd.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/hid/hid-picolcd.c
+++ b/drivers/hid/hid-picolcd.c
@@ -1424,7 +1424,7 @@ static ssize_t picolcd_operation_mode_st
 		buf += 10;
 		cnt -= 10;
 	}
-	if (!report)
+	if (!report || report->maxfield != 1)
 		return -EINVAL;
 
 	while (cnt > 0 && (buf[cnt-1] == '\n' || buf[cnt-1] == '\r'))
--
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/
Powered by blists - more mailing lists