diff options
| author | Alex Dewar <alex.dewar@gmx.co.uk> | 2020-03-27 20:36:25 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2020-03-29 23:56:47 +0200 |
| commit | 4a7c46247f9c620c0390a15cb00b6ef9576b9c23 (patch) | |
| tree | 3149e8bd168c3830892c59aeae4022d5ae7adcf0 /arch/um | |
| parent | um: vector: Avoid NULL ptr deference if transport is unset (diff) | |
| download | linux-4a7c46247f9c620c0390a15cb00b6ef9576b9c23.tar.xz linux-4a7c46247f9c620c0390a15cb00b6ef9576b9c23.zip | |
um: Remove some unnecessary NULL checks in vector_user.c
kfree() already checks for null pointers, so additional checking is
unnecessary.
Signed-off-by: Alex Dewar <alex.dewar@gmx.co.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/drivers/vector_user.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/arch/um/drivers/vector_user.c b/arch/um/drivers/vector_user.c index ddcd917be0af..aa28e9eecb7b 100644 --- a/arch/um/drivers/vector_user.c +++ b/arch/um/drivers/vector_user.c @@ -221,8 +221,7 @@ static struct vector_fds *user_init_tap_fds(struct arglist *ifspec) return result; tap_cleanup: printk(UM_KERN_ERR "user_init_tap: init failed, error %d", fd); - if (result != NULL) - kfree(result); + kfree(result); return NULL; } @@ -266,8 +265,7 @@ static struct vector_fds *user_init_hybrid_fds(struct arglist *ifspec) return result; hybrid_cleanup: printk(UM_KERN_ERR "user_init_hybrid: init failed"); - if (result != NULL) - kfree(result); + kfree(result); return NULL; } @@ -344,10 +342,8 @@ static struct vector_fds *user_init_unix_fds(struct arglist *ifspec, int id) unix_cleanup: if (fd >= 0) os_close_file(fd); - if (remote_addr != NULL) - kfree(remote_addr); - if (result != NULL) - kfree(result); + kfree(remote_addr); + kfree(result); return NULL; } @@ -382,8 +378,7 @@ static struct vector_fds *user_init_raw_fds(struct arglist *ifspec) return result; raw_cleanup: printk(UM_KERN_ERR "user_init_raw: init failed, error %d", err); - if (result != NULL) - kfree(result); + kfree(result); return NULL; } |