a0f61528af
CVE-2016-7909: pcnet: Infinite loop in pcnet_rdra_addr (bz #1381196) CVE-2016-7994: virtio-gpu: memory leak in resource_create_2d (bz #1382667) CVE-2016-8577: 9pfs: host memory leakage in v9fs_read (bz #1383286) CVE-2016-8578: 9pfs: potential NULL dereferencein 9pfs routines (bz #1383292) CVE-2016-8668: OOB buffer access in rocker switch emulation (bz #1384898) CVE-2016-8669: divide by zero error in serial_update_parameters (bz #1384911) CVE-2016-8909: intel-hda: infinite loop in dma buffer stream (bz #1388053) Infinite loop vulnerability in a9_gtimer_update (bz #1388300) CVE-2016-9101: eepro100: memory leakage at device unplug (bz #1389539) CVE-2016-9103: 9pfs: information leakage via xattr (bz #1389643) CVE-2016-9102: 9pfs: memory leakage when creating extended attribute (bz #1389551) CVE-2016-9104: 9pfs: integer overflow leading to OOB access (bz #1389687) CVE-2016-9105: 9pfs: memory leakage in v9fs_link (bz #1389704) CVE-2016-9106: 9pfs: memory leakage in v9fs_write (bz #1389713) CVE-2016-9381: xen: incautious about shared ring processing (bz #1397385) CVE-2016-9921: Divide by zero vulnerability in cirrus_do_copy (bz #1399054) CVE-2016-9776: infinite loop while receiving data in mcf_fec_receive (bz #1400830) CVE-2016-9845: information leakage in virgl_cmd_get_capset_info (bz #1402247) CVE-2016-9846: virtio-gpu: memory leakage while updating cursor data (bz #1402258) CVE-2016-9907: usbredir: memory leakage when destroying redirector (bz #1402266) CVE-2016-9911: usb: ehci: memory leakage in ehci_init_transfer (bz #1402273) CVE-2016-9913: 9pfs: memory leakage via proxy/handle callbacks (bz #1402277) CVE-2016-10028: virtio-gpu-3d: OOB access while reading virgl capabilities (bz #1406368) CVE-2016-9908: virtio-gpu: information leakage in virgl_cmd_get_capset (bz #1402263) CVE-2016-9912: virtio-gpu: memory leakage when destroying gpu resource (bz #1402285)
71 lines
2.5 KiB
Diff
71 lines
2.5 KiB
Diff
From: Li Qiang <liqiang6-s@360.cn>
|
|
Date: Tue, 1 Nov 2016 12:00:40 +0100
|
|
Subject: [PATCH] 9pfs: add xattrwalk_fid field in V9fsXattr struct
|
|
|
|
Currently, 9pfs sets the 'copied_len' field in V9fsXattr
|
|
to -1 to tag xattr walk fid. As the 'copied_len' is also
|
|
used to account for copied bytes, this may make confusion. This patch
|
|
add a bool 'xattrwalk_fid' to tag the xattr walk fid.
|
|
|
|
Suggested-by: Greg Kurz <groug@kaod.org>
|
|
Signed-off-by: Li Qiang <liqiang6-s@360.cn>
|
|
Reviewed-by: Greg Kurz <groug@kaod.org>
|
|
Signed-off-by: Greg Kurz <groug@kaod.org>
|
|
(cherry picked from commit dd28fbbc2edc0822965d402d927ce646326d6954)
|
|
---
|
|
hw/9pfs/9p.c | 7 ++++---
|
|
hw/9pfs/9p.h | 1 +
|
|
2 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
|
|
index 54554ba..ad57123 100644
|
|
--- a/hw/9pfs/9p.c
|
|
+++ b/hw/9pfs/9p.c
|
|
@@ -310,7 +310,7 @@ static int v9fs_xattr_fid_clunk(V9fsPDU *pdu, V9fsFidState *fidp)
|
|
{
|
|
int retval = 0;
|
|
|
|
- if (fidp->fs.xattr.copied_len == -1) {
|
|
+ if (fidp->fs.xattr.xattrwalk_fid) {
|
|
/* getxattr/listxattr fid */
|
|
goto free_value;
|
|
}
|
|
@@ -3177,7 +3177,7 @@ static void v9fs_xattrwalk(void *opaque)
|
|
*/
|
|
xattr_fidp->fs.xattr.len = size;
|
|
xattr_fidp->fid_type = P9_FID_XATTR;
|
|
- xattr_fidp->fs.xattr.copied_len = -1;
|
|
+ xattr_fidp->fs.xattr.xattrwalk_fid = true;
|
|
if (size) {
|
|
xattr_fidp->fs.xattr.value = g_malloc(size);
|
|
err = v9fs_co_llistxattr(pdu, &xattr_fidp->path,
|
|
@@ -3210,7 +3210,7 @@ static void v9fs_xattrwalk(void *opaque)
|
|
*/
|
|
xattr_fidp->fs.xattr.len = size;
|
|
xattr_fidp->fid_type = P9_FID_XATTR;
|
|
- xattr_fidp->fs.xattr.copied_len = -1;
|
|
+ xattr_fidp->fs.xattr.xattrwalk_fid = true;
|
|
if (size) {
|
|
xattr_fidp->fs.xattr.value = g_malloc(size);
|
|
err = v9fs_co_lgetxattr(pdu, &xattr_fidp->path,
|
|
@@ -3266,6 +3266,7 @@ static void v9fs_xattrcreate(void *opaque)
|
|
xattr_fidp = file_fidp;
|
|
xattr_fidp->fid_type = P9_FID_XATTR;
|
|
xattr_fidp->fs.xattr.copied_len = 0;
|
|
+ xattr_fidp->fs.xattr.xattrwalk_fid = false;
|
|
xattr_fidp->fs.xattr.len = size;
|
|
xattr_fidp->fs.xattr.flags = flags;
|
|
v9fs_string_init(&xattr_fidp->fs.xattr.name);
|
|
diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h
|
|
index a386033..699235d 100644
|
|
--- a/hw/9pfs/9p.h
|
|
+++ b/hw/9pfs/9p.h
|
|
@@ -164,6 +164,7 @@ typedef struct V9fsXattr
|
|
void *value;
|
|
V9fsString name;
|
|
int flags;
|
|
+ bool xattrwalk_fid;
|
|
} V9fsXattr;
|
|
|
|
typedef struct V9fsDir {
|