diff options
| author |   Marios Makassikis <mmakassikis@freebox.fr> | 2021-04-13 13:25:57 +0900 |
|---|---|---|
| committer |   Steve French <stfrench@microsoft.com> | 2021-05-10 19:15:41 -0500 |
| commit | 915f570a971b4e5abd95e8b169dd41c120ab5a5b (patch) | |
| tree | 76b19febeddbee25921673e321a0f999da9311d3 | |
| parent | cifsd: fix reference count decrement of unclaimed file in __ksmbd_lookup_fd (diff) | |
| download | linux-dev-915f570a971b4e5abd95e8b169dd41c120ab5a5b.tar.xz linux-dev-915f570a971b4e5abd95e8b169dd41c120ab5a5b.zip | |
cifsd: Remove smb2_put_name()
smb2_put_name() is called twice, and both call sites do the IS_ERR() check
before.
Signed-off-by: Marios Makassikis <mmakassikis@freebox.fr>
Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
| -rw-r--r-- | fs/cifsd/smb2pdu.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/fs/cifsd/smb2pdu.c b/fs/cifsd/smb2pdu.c index 08b06ec97e22..1ff0b20ff7b8 100644 --- a/fs/cifsd/smb2pdu.c +++ b/fs/cifsd/smb2pdu.c @@ -666,16 +666,6 @@ smb2_get_name(struct ksmbd_share_config *share, const char *src, return unixname; } -/** - * smb2_put_name() - free memory allocated for filename - * @name: filename pointer to be freed - */ -static void smb2_put_name(void *name) -{ - if (!IS_ERR(name)) - kfree(name); -} - int setup_async_work(struct ksmbd_work *work, void (*fn)(void **), void **arg) { struct smb2_hdr *rsp_hdr; @@ -5418,7 +5408,7 @@ static int smb2_rename(struct ksmbd_work *work, struct ksmbd_file *fp, out: kfree(pathname); if (!IS_ERR(new_name)) - smb2_put_name(new_name); + kfree(new_name); return rc; } @@ -5483,7 +5473,7 @@ static int smb2_create_link(struct ksmbd_work *work, rc = -EINVAL; out: if (!IS_ERR(link_name)) - smb2_put_name(link_name); + kfree(link_name); kfree(pathname); return rc; } |