linux-kernel - [PATCH] procfs: also fix proc_reg_get_unmapped

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 25 Nov 2013 16:22:31 +0000
From:	"Jan Beulich" <JBeulich@...e.com>
To:	<akpm@...ux-foundation.org>
Cc:	<davem@...emloft.net>, <adobriyan@...il.com>,
	<d.hatayama@...fujitsu.com>, <linux-kernel@...r.kernel.org>
Subject: [PATCH] procfs: also fix proc_reg_get_unmapped_area() for !MMU
 case

Commit fad1a86e ("procfs: call default get_unmapped_area on MMU-present
architectures"), as its title says, took care of only the MMU case,
leaving the !MMU side still in the regressed state (returning -EIO in
all cases where pde->proc_fops->get_unmapped_area is NULL).

Signed-off-by: Jan Beulich <jbeulich@...e.com>
Cc: HATAYAMA Daisuke <d.hatayama@...fujitsu.com>
Cc: Alexey Dobriyan <adobriyan@...il.com>
Cc: David S. Miller <davem@...emloft.net> 
---
 fs/proc/inode.c |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

--- 3.13-rc1/fs/proc/inode.c
+++ 3.13-rc1-proc-get-unmapped-area/fs/proc/inode.c
@@ -292,16 +292,19 @@ proc_reg_get_unmapped_area(struct file *
 {
 	struct proc_dir_entry *pde = PDE(file_inode(file));
 	unsigned long rv = -EIO;
-	unsigned long (*get_area)(struct file *, unsigned long, unsigned long,
-				  unsigned long, unsigned long) = NULL;
+
 	if (use_pde(pde)) {
+		typeof(proc_reg_get_unmapped_area) *get_area
 #ifdef CONFIG_MMU
-		get_area = current->mm->get_unmapped_area;
+			= pde->proc_fops->get_unmapped_area
+			  ?: current->mm->get_unmapped_area;
+#else
+			= pde->proc_fops->get_unmapped_area;
 #endif
-		if (pde->proc_fops->get_unmapped_area)
-			get_area = pde->proc_fops->get_unmapped_area;
-		if (get_area)
-			rv = get_area(file, orig_addr, len, pgoff, flags);
+
+		rv = get_area
+		     ? get_area(file, orig_addr, len, pgoff, flags)
+		     : orig_addr;
 		unuse_pde(pde);
 	}
 	return rv;



--
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/