projects / pve-kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| 035dbe67 FG |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | From: Elena Reshetova <elena.reshetova@intel.com> | |
| 3 | Date: Mon, 4 Sep 2017 13:11:46 +0300 | |
| 4 | Subject: [PATCH] uvcvideo: prevent speculative execution | |
| 5 | MIME-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ||
| 9 | CVE-2017-5753 | |
| 10 | CVE-2017-5715 | |
| 11 | ||
| 12 | real commit text tbd | |
| 13 | ||
| 14 | Signed-off-by: Elena Reshetova <elena.reshetova@intel.com> | |
| 15 | Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com> | |
| 16 | Signed-off-by: Andy Whitcroft <apw@canonical.com> | |
| 17 | Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> | |
| 18 | (cherry picked from commit 65d4588b16395360695525add0ca79fa6ba04fa5) | |
| 19 | Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> | |
| 20 | --- | |
| 21 | drivers/media/usb/uvc/uvc_v4l2.c | 1 + | |
| 22 | 1 file changed, 1 insertion(+) | |
| 23 | ||
| 24 | diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c | |
| 25 | index 3e7e283a44a8..fcedd1798e9d 100644 | |
| 26 | --- a/drivers/media/usb/uvc/uvc_v4l2.c | |
| 27 | +++ b/drivers/media/usb/uvc/uvc_v4l2.c | |
| 28 | @@ -821,6 +821,7 @@ static int uvc_ioctl_enum_input(struct file *file, void *fh, | |
| 29 | } | |
| 30 | pin = iterm->id; | |
| 31 | } else if (index < selector->bNrInPins) { | |
| 32 | + gmb(); | |
| 33 | pin = selector->baSourceID[index]; | |
| 34 | list_for_each_entry(iterm, &chain->entities, chain) { | |
| 35 | if (!UVC_ENTITY_IS_ITERM(iterm)) | |
| 36 | -- | |
| 37 | 2.14.2 | |
| 38 |