[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20170210211814.18257-1-christophe.jaillet@wanadoo.fr>
Date: Fri, 10 Feb 2017 22:18:14 +0100
From: Christophe JAILLET <christophe.jaillet@...adoo.fr>
To: miklos@...redi.hu
Cc: linux-unionfs@...r.kernel.org, linux-kernel@...r.kernel.org,
kernel-janitors@...r.kernel.org,
Christophe JAILLET <christophe.jaillet@...adoo.fr>
Subject: [PATCH] ovl: Avoid some memory allocation
Reorder code to avoid allocating and then freeing some memory in an error
handling path.
Signed-off-by: Christophe JAILLET <christophe.jaillet@...adoo.fr>
---
fs/overlayfs/namei.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
index 023bb0b03352..ba80ebb8a104 100644
--- a/fs/overlayfs/namei.c
+++ b/fs/overlayfs/namei.c
@@ -35,13 +35,13 @@ static int ovl_check_redirect(struct dentry *dentry, struct ovl_lookup_data *d,
return 0;
goto fail;
}
+ if (res == 0)
+ goto invalid;
+
buf = kzalloc(prelen + res + strlen(post) + 1, GFP_TEMPORARY);
if (!buf)
return -ENOMEM;
- if (res == 0)
- goto invalid;
-
res = vfs_getxattr(dentry, OVL_XATTR_REDIRECT, buf, res);
if (res < 0)
goto fail;
--
2.9.3
Powered by blists - more mailing lists