diff mbox

xen-kbdfront: correct return value checks on xenbus_scanf()

Message ID 577E26A402000078000FBE93@prv-mh.provo.novell.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jan Beulich July 7, 2016, 7:53 a.m. UTC 
Only a positive return value indicates success.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
 drivers/input/misc/xen-kbdfront.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Dmitry Torokhov July 9, 2016, 12:33 a.m. UTC | #1 
On Thu, Jul 07, 2016 at 01:53:40AM -0600, Jan Beulich wrote:
> Only a positive return value indicates success.

If I am reading this correctly xenbus_scanf() guarantees that it will
not return 0. From include/xen/xenbus.h:

/* Single read and scanf: returns -errno or num scanned if > 0. */
__scanf(4, 5)
int xenbus_scanf(struct xenbus_transaction t,
		 const char *dir, const char *node, const char *fmt, ...);

and the code matches:

	...
	/* Distinctive errno. */
	if (ret == 0)
		return -ERANGE;
	return ret;

> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
> ---
>  drivers/input/misc/xen-kbdfront.c |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> --- 4.7-rc6-xenbus_scanf.orig/drivers/input/misc/xen-kbdfront.c
> +++ 4.7-rc6-xenbus_scanf/drivers/input/misc/xen-kbdfront.c
> @@ -127,7 +127,8 @@ static int xenkbd_probe(struct xenbus_de
>  	if (!info->page)
>  		goto error_nomem;
>  
> -	if (xenbus_scanf(XBT_NIL, dev->otherend, "feature-abs-pointer", "%d", &abs) < 0)
> +	if (xenbus_scanf(XBT_NIL, dev->otherend,
> +			 "feature-abs-pointer", "%d", &abs) <= 0)
>  		abs = 0;
>  	if (abs) {
>  		ret = xenbus_printf(XBT_NIL, dev->nodename,
> @@ -324,7 +325,7 @@ static void xenkbd_backend_changed(struc
>  InitWait:
>  		ret = xenbus_scanf(XBT_NIL, info->xbdev->otherend,
>  				   "feature-abs-pointer", "%d", &val);
> -		if (ret < 0)
> +		if (ret <= 0)
>  			val = 0;
>  		if (val) {
>  			ret = xenbus_printf(XBT_NIL, info->xbdev->nodename,
> 
> 

Thanks.
diff mbox

Patch

--- 4.7-rc6-xenbus_scanf.orig/drivers/input/misc/xen-kbdfront.c
+++ 4.7-rc6-xenbus_scanf/drivers/input/misc/xen-kbdfront.c
@@ -127,7 +127,8 @@  static int xenkbd_probe(struct xenbus_de
 	if (!info->page)
 		goto error_nomem;
 
-	if (xenbus_scanf(XBT_NIL, dev->otherend, "feature-abs-pointer", "%d", &abs) < 0)
+	if (xenbus_scanf(XBT_NIL, dev->otherend,
+			 "feature-abs-pointer", "%d", &abs) <= 0)
 		abs = 0;
 	if (abs) {
 		ret = xenbus_printf(XBT_NIL, dev->nodename,
@@ -324,7 +325,7 @@  static void xenkbd_backend_changed(struc
 InitWait:
 		ret = xenbus_scanf(XBT_NIL, info->xbdev->otherend,
 				   "feature-abs-pointer", "%d", &val);
-		if (ret < 0)
+		if (ret <= 0)
 			val = 0;
 		if (val) {
 			ret = xenbus_printf(XBT_NIL, info->xbdev->nodename,