xen: xenbus: set error code on failure
PATCH 1/1 xen: xenbus: set error code on failure
In function xenstored_local_init(), the value of return variable err should be negative on errors. But the value of err keeps 0 even if the call to get_zeroed_page() returns a NULL pointer. This patch assigns "-ENOMEM" to err on the error branch.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188721
--- drivers/xen/xenbus/xenbus_probe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/xen/xenbus/xenbus_probe.c +3 -1
@@ -708,8 +708,10 @@ static int __init xenstored_local_init(void)/* Allocate Xenstore page */ page =get_zeroed_page (GFP_KERNEL ); -if (!page) +if (!page) { + err = -ENOMEM ; goto out_err; + } xen_store_gfn = xen_start_info->store_mfn =virt_to_gfn ((void *)page);
Signature · 1 line
1.9.1
Juergen Gross
maintainerQuoted 17 lines · Pan Bian
In function
xenstored_local_init(), the value of return variable err should be negative on errors. But the value of err keeps 0 even if the call toget_zeroed_page()returns a NULL pointer. This patch assigns "-ENOMEM" to err on the error branch.Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188721
Signed-off-by Pan Bian <[email protected]>--- drivers/xen/xenbus/xenbus_probe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/xen/xenbus/xenbus_probe.c +0
-0
drivers/xen/xenbus/xenbus_probe.c static int __init xenstored_local_init(void) · line 716
Quoted 10 lines
drivers/xen/xenbus/xenbus_probe.c +3
-1@@ -708,8 +708,10 @@ static int __init xenstored_local_init(void)/* Allocate Xenstore page */ page =get_zeroed_page (GFP_KERNEL ); -if (!page) +if (!page) { + err = -ENOMEM ; goto out_err; + } xen_store_gfn = xen_start_info->store_mfn =virt_to_gfn ((void *)page);
Why don't you preset err to -ENOMEM instead? Initializing it to 0 is kind of pointless.
Ans while at it: preinitializing page isn't needed, too, and in the error path testing page for being non-zero isn't neede either (free_page() will do the right thing in case the parameter is 0).
Juergen
From: PanBian <[email protected]>
Quoted 27 lines · Juergen Gross
Quoted 26 lines · Pan Bian
In function
xenstored_local_init(), the value of return variable err should be negative on errors. But the value of err keeps 0 even if the call toget_zeroed_page()returns a NULL pointer. This patch assigns "-ENOMEM" to err on the error branch.Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188721
Signed-off-by Pan Bian <[email protected]>--- drivers/xen/xenbus/xenbus_probe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/xen/xenbus/xenbus_probe.c +3
-1@@ -708,8 +708,10 @@ static int __init xenstored_local_init(void)/* Allocate Xenstore page */ page =get_zeroed_page (GFP_KERNEL ); -if (!page) +if (!page) { + err = -ENOMEM ; goto out_err; + }
Quoted 4 lines
drivers/xen/xenbus/xenbus_probe.c static int __init xenstored_local_init(void) · line 716
Quoted 1 line
drivers/xen/xenbus/xenbus_probe.c +0
-0xen_store_gfn = xen_start_info->store_mfn =virt_to_gfn ((void *)page);Why don't you preset err to
-ENOMEMinstead? Initializing it to 0 is kind of pointless.
I think presetting and setting on demand are both effective to fix this bug. Nevertheless, I will resubmit a second version if you insist.
Quoted 8 lines
Ans while at it: preinitializing page isn't needed, too, and in the error path testing page for being non-zero isn't neede either (
free_page()will do the right thing in case the parameter is 0).Juergen
Thanks!
Best regards,
Pan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel
Juergen Gross
maintainerQuoted 17 lines · Pan Bian
In function
xenstored_local_init(), the value of return variable err should be negative on errors. But the value of err keeps 0 even if the call toget_zeroed_page()returns a NULL pointer. This patch assigns "-ENOMEM" to err on the error branch.Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188721
Signed-off-by Pan Bian <[email protected]>--- drivers/xen/xenbus/xenbus_probe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/xen/xenbus/xenbus_probe.c +0
-0
drivers/xen/xenbus/xenbus_probe.c static int __init xenstored_local_init(void) · line 716
Quoted 10 lines
drivers/xen/xenbus/xenbus_probe.c +3
-1@@ -708,8 +708,10 @@ static int __init xenstored_local_init(void)/* Allocate Xenstore page */ page =get_zeroed_page (GFP_KERNEL ); -if (!page) +if (!page) { + err = -ENOMEM ; goto out_err; + } xen_store_gfn = xen_start_info->store_mfn =virt_to_gfn ((void *)page);
Why don't you preset err to -ENOMEM instead? Initializing it to 0 is kind of pointless.
Ans while at it: preinitializing page isn't needed, too, and in the error path testing page for being non-zero isn't neede either (free_page() will do the right thing in case the parameter is 0).
Juergen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xen.org/xen-devel