| From foo@baz Mon Nov 6 10:42:09 CET 2017 |
| From: Jan Beulich <JBeulich@suse.com> |
| Date: Sat, 7 Oct 2017 22:38:00 +0000 |
| Subject: xen/manage: correct return value check on xenbus_scanf() |
| |
| From: Jan Beulich <JBeulich@suse.com> |
| |
| |
| [ Upstream commit 4fed1b125eb6252bde478665fc05d4819f774fa8 ] |
| |
| A negative return value indicates an error; in fact the function at |
| present won't ever return zero. |
| |
| Signed-off-by: Jan Beulich <jbeulich@suse.com> |
| Reviewed-by: Juergen Gross <jgross@suse.com> |
| Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> |
| Signed-off-by: Sasha Levin <alexander.levin@verizon.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/xen/manage.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/xen/manage.c |
| +++ b/drivers/xen/manage.c |
| @@ -272,7 +272,7 @@ static void sysrq_handler(struct xenbus_ |
| err = xenbus_transaction_start(&xbt); |
| if (err) |
| return; |
| - if (!xenbus_scanf(xbt, "control", "sysrq", "%c", &sysrq_key)) { |
| + if (xenbus_scanf(xbt, "control", "sysrq", "%c", &sysrq_key) < 0) { |
| pr_err("Unable to read sysrq code in control/sysrq\n"); |
| xenbus_transaction_end(xbt, 1); |
| return; |