xf86-video-intel: 2 commits - src/intel_device.c tools/virtual.c

[Chris Wilson]

 src/intel_device.c |    2 +-
 tools/virtual.c    |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 016599783cf3e1a3e2362c82c8767a7398048db7
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Aug 26 12:44:58 2014 +0100

    intel: Limit read to always fit in the buffer
    
    Reported-by: Zdenek Kabelac <zkabelac at redhat.com>
    Suggested-by: Zdenek Kabelac <zkabelac at redhat.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_device.c b/src/intel_device.c
index 3924c8f..9a2ebb0 100644
--- a/src/intel_device.c
+++ b/src/intel_device.c
@@ -367,7 +367,7 @@ static int __intel_open_device__pci(const struct pci_device *pci)
 			if (fd == -1)
 				break;
 
-			base = read(fd, path, 256);
+			base = read(fd, path, sizeof(path) - 1);
 			close(fd);
 
 			fd = -1;
commit e827f80e5c07ac13802a24753b249e05e18a290e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Aug 26 12:42:11 2014 +0100

    intel-virtual-output: Sanity check length on user supplied socket path
    
    Reported-by: Zdenek Kabelac <zkabelac at redhat.com>
    Suggested-by: Zdenek Kabelac <zkabelac at redhat.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/tools/virtual.c b/tools/virtual.c
index 83b934a..9b1912f 100644
--- a/tools/virtual.c
+++ b/tools/virtual.c
@@ -2387,7 +2387,8 @@ static int bumblebee_open(struct context *ctx)
 	}
 
 	addr.sun_family = AF_UNIX;
-	strcpy(addr.sun_path, optarg && *optarg ? optarg : "/var/run/bumblebee.socket");
+	strncpy(addr.sun_path, sizeof(addr.sun_path),
+		optarg && *optarg ? optarg : "/var/run/bumblebee.socket");
 	if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
 		DBG(X11, ("%s unable to create a socket: %d\n", __func__, errno));
 		goto err;