diff options
Diffstat (limited to 'security/tomoyo/realpath.c')
| -rw-r--r-- | security/tomoyo/realpath.c | 18 | 
1 files changed, 9 insertions, 9 deletions
diff --git a/security/tomoyo/realpath.c b/security/tomoyo/realpath.c index 3bbe01a7a4b..40927a84cb6 100644 --- a/security/tomoyo/realpath.c +++ b/security/tomoyo/realpath.c @@ -5,7 +5,7 @@   *   * Copyright (C) 2005-2009  NTT DATA CORPORATION   * - * Version: 2.2.0-pre   2009/02/01 + * Version: 2.2.0   2009/04/01   *   */ @@ -165,11 +165,11 @@ char *tomoyo_realpath_from_path(struct path *path)   */  char *tomoyo_realpath(const char *pathname)  { -	struct nameidata nd; +	struct path path; -	if (pathname && path_lookup(pathname, LOOKUP_FOLLOW, &nd) == 0) { -		char *buf = tomoyo_realpath_from_path(&nd.path); -		path_put(&nd.path); +	if (pathname && kern_path(pathname, LOOKUP_FOLLOW, &path) == 0) { +		char *buf = tomoyo_realpath_from_path(&path); +		path_put(&path);  		return buf;  	}  	return NULL; @@ -184,11 +184,11 @@ char *tomoyo_realpath(const char *pathname)   */  char *tomoyo_realpath_nofollow(const char *pathname)  { -	struct nameidata nd; +	struct path path; -	if (pathname && path_lookup(pathname, 0, &nd) == 0) { -		char *buf = tomoyo_realpath_from_path(&nd.path); -		path_put(&nd.path); +	if (pathname && kern_path(pathname, 0, &path) == 0) { +		char *buf = tomoyo_realpath_from_path(&path); +		path_put(&path);  		return buf;  	}  	return NULL;  |