Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1715966

[PATCH 8/8] CIFS: One function call less in cifs_do_create() after error detection

Show all headers | View raw

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 20 Aug 2017 17:47:44 +0200

The kfree() function was called in a few cases by the
cifs_do_create() function during error handling even if
the passed variable contained a null pointer.

Add a jump target according to the Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 fs/cifs/dir.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 69babcf4f653..73e68aa5326e 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -258,7 +258,7 @@ cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned int xid,
 				CIFSSMBClose(xid, tcon, fid->netfid);
 				iput(newinode);
 				rc = -EISDIR;
-				goto out;
+				goto free_path;
 			}
 
 			if (!S_ISREG(newinode->i_mode)) {
@@ -301,7 +301,7 @@ cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned int xid,
 			break;
 
 		default:
-			goto out;
+			goto free_path;
 		}
 		/*
 		 * fallthrough to retry, using older open call, this is case
@@ -334,13 +334,13 @@ cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned int xid,
 
 	if (!server->ops->open) {
 		rc = -ENOSYS;
-		goto out;
+		goto free_path;
 	}
 
 	buf = kmalloc(sizeof(*buf), GFP_KERNEL);
 	if (buf == NULL) {
 		rc = -ENOMEM;
-		goto out;
+		goto free_path;
 	}
 
 	/*
@@ -444,6 +444,7 @@ cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned int xid,
 
 out:
 	kfree(buf);
+free_path:
 	kfree(full_path);
 	return rc;
 
-- 
2.14.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/8] CIFS: Adjustments for several function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-20 18:40 +0200
  [PATCH 3/8] CIFS: One function call less in cifs_lookup() after error  detection SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-20 18:40 +0200
  [PATCH 4/8] CIFS: Use common error handling code in cifs_mknod() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-20 18:40 +0200
  [PATCH 2/8] CIFS: Improve 27 size determinations SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-20 18:40 +0200
  [PATCH 8/8] CIFS: One function call less in cifs_do_create() after  error detection SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-20 18:50 +0200
  [PATCH 7/8] CIFS: Delete an unnecessary variable initialisation in  cifs_do_create() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-20 18:50 +0200
  [PATCH 6/8] CIFS: Return directly after a failed  build_path_from_dentry() in cifs_do_create() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-20 18:50 +0200

csiph-web