From d4cd57807660a6fd3b47bc83de14a78fa8292a5f Mon Sep 17 00:00:00 2001 From: Daria Brashear Date: Wed, 8 Jul 2015 14:16:41 -0400 Subject: [PATCH] afs: Clear pioctl data interchange buffer before use Avoid leaking data in pioctl interchange buffers; clear the memory when one is allocated. FIXES 131892 (CVE-2015-3284) (cherry picked from commit 592a99d6e693bc640e2bdfc2e7e5243fcedc8f93) Change-Id: I90fef404978bd7aae3eb88836bcd4f95587fd45c --- src/afs/afs_pioctl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c index e9a84e3d2..89a56b976 100644 --- a/src/afs/afs_pioctl.c +++ b/src/afs/afs_pioctl.c @@ -62,6 +62,11 @@ afs_pd_alloc(struct afs_pdata *apd, size_t size) if (apd->ptr == NULL) return ENOMEM; + if (size > AFS_LRALLOCSIZ) + memset(apd->ptr, 0, size + 1); + else + memset(apd->ptr, 0, AFS_LRALLOCSIZ); + apd->remaining = size; return 0; -- 2.39.5