[-next] staging: Fix error return code in vboxsf_fill_super()
diff mbox series

Message ID 20191106115954.114678-1-weiyongjun1@huawei.com
State New
Headers show
Series
  • [-next] staging: Fix error return code in vboxsf_fill_super()
Related show

Commit Message

Wei Yongjun Nov. 6, 2019, 11:59 a.m. UTC
Fix to return negative error code -ENOMEM from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: df4028658f9d ("staging: Add VirtualBox guest shared folder (vboxsf) support")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
---
 drivers/staging/vboxsf/super.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Hans de Goede Nov. 6, 2019, 12:03 p.m. UTC | #1
Hi,

On 06-11-2019 12:59, Wei Yongjun wrote:
> Fix to return negative error code -ENOMEM from the error handling
> case instead of 0, as done elsewhere in this function.
> 
> Fixes: df4028658f9d ("staging: Add VirtualBox guest shared folder (vboxsf) support")
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>

Good catch, thank you:

Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans


> ---
>   drivers/staging/vboxsf/super.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/vboxsf/super.c b/drivers/staging/vboxsf/super.c
> index 3913ffafa83b..0bf4d724aefd 100644
> --- a/drivers/staging/vboxsf/super.c
> +++ b/drivers/staging/vboxsf/super.c
> @@ -176,8 +176,10 @@ static int vboxsf_fill_super(struct super_block *sb, struct fs_context *fc)
>   	/* Turn source into a shfl_string and map the folder */
>   	size = strlen(fc->source) + 1;
>   	folder_name = kmalloc(SHFLSTRING_HEADER_SIZE + size, GFP_KERNEL);
> -	if (!folder_name)
> +	if (!folder_name) {
> +		err = -ENOMEM;
>   		goto fail_free;
> +	}
>   	folder_name->size = size;
>   	folder_name->length = size - 1;
>   	strlcpy(folder_name->string.utf8, fc->source, size);
> 
> 
>

Patch
diff mbox series

diff --git a/drivers/staging/vboxsf/super.c b/drivers/staging/vboxsf/super.c
index 3913ffafa83b..0bf4d724aefd 100644
--- a/drivers/staging/vboxsf/super.c
+++ b/drivers/staging/vboxsf/super.c
@@ -176,8 +176,10 @@  static int vboxsf_fill_super(struct super_block *sb, struct fs_context *fc)
 	/* Turn source into a shfl_string and map the folder */
 	size = strlen(fc->source) + 1;
 	folder_name = kmalloc(SHFLSTRING_HEADER_SIZE + size, GFP_KERNEL);
-	if (!folder_name)
+	if (!folder_name) {
+		err = -ENOMEM;
 		goto fail_free;
+	}
 	folder_name->size = size;
 	folder_name->length = size - 1;
 	strlcpy(folder_name->string.utf8, fc->source, size);