Attachment 853096 Details for Bug 1050964 – Patch to make d_path(len=0) safe

[patch] Patch to make d_path(len=0) safe

dcache.c.diff (text/plain), 1.79 KB, created by Denys Vlasenko on 2014-01-21 10:23:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Denys Vlasenko

Created: 2014-01-21 10:23:30 UTC

Size: 1.79 KB

patch

obsolete

>--- linux-3.12.6-300.fc18.x86_64/fs/dcache.c.orig	2014-01-21 11:00:11.054064539 +0100
>+++ linux-3.12.6-300.fc18.x86_64/fs/dcache.c	2014-01-21 11:11:57.701178189 +0100
>@@ -2973,7 +2973,9 @@ char *__d_path(const struct path *path,
> 	char *res = buf + buflen;
> 	int error;
> 
>-	prepend(&res, &buflen, "\0", 1);
>+	error = prepend(&res, &buflen, "\0", 1);
>+	if (error)
>+		return ERR_PTR(error);
> 	br_read_lock(&vfsmount_lock);
> 	error = prepend_path(path, root, &res, &buflen);
> 	br_read_unlock(&vfsmount_lock);
>@@ -2992,7 +2994,9 @@ char *d_absolute_path(const struct path
> 	char *res = buf + buflen;
> 	int error;
> 
>-	prepend(&res, &buflen, "\0", 1);
>+	error = prepend(&res, &buflen, "\0", 1);
>+	if (error)
>+		return ERR_PTR(error);
> 	br_read_lock(&vfsmount_lock);
> 	error = prepend_path(path, &root, &res, &buflen);
> 	br_read_unlock(&vfsmount_lock);
>@@ -3011,7 +3015,9 @@ static int path_with_deleted(const struc
> 			     const struct path *root,
> 			     char **buf, int *buflen)
> {
>-	prepend(buf, buflen, "\0", 1);
>+	error = prepend(buf, buflen, "\0", 1);
>+	if (error)
>+		return error;
> 	if (d_unlinked(path->dentry)) {
> 		int error = prepend(buf, buflen, " (deleted)", 10);
> 		if (error)
>@@ -3127,8 +3133,11 @@ restart:
> 	end = buf + buflen;
> 	len = buflen;
> 	prepend(&end, &len, "\0", 1);
>-	if (buflen < 1)
>+	if (buflen < 1) {
>+		if (!(seq & 1))
>+			rcu_read_unlock();
> 		goto Elong;
>+	}
> 	/* Get '/' right */
> 	retval = end-1;
> 	*retval = '/';
>@@ -3233,8 +3242,9 @@ SYSCALL_DEFINE2(getcwd, char __user *, b
> 		char *cwd = page + PATH_MAX;
> 		int buflen = PATH_MAX;
> 
>-		prepend(&cwd, &buflen, "\0", 1);
>-		error = prepend_path(&pwd, &root, &cwd, &buflen);
>+		error = prepend(&cwd, &buflen, "\0", 1);
>+		if (!error)
>+			error = prepend_path(&pwd, &root, &cwd, &buflen);
> 		br_read_unlock(&vfsmount_lock);
> 		rcu_read_unlock();
>

Actions: View | Diff

Attachments on bug 1050964: 851700 | 852718 | 853096 | 859160 | 859769