xen: fixes for 4.15-rc3
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAABAgAGBQJaKlu/AAoJELDendYovxMvaqoH/i7gN9xry7QkUM6RkwddGwYY v0rqaUo4WCW27yFOE7Bzej9Y+W92/eFPJnVUhc/quTVfV+uEjbs4PiAwuxSr+lIU X+BhBNbEi9C5RlRL1z75J0ZySyu6WXL2hsmPbc0wrrqdQikfiZ7bnRjdGAHh5C5C TijKQKGZTt6ccjIPUEZTIqeajOt/p7uxkCXPWhHQA1mudf9PVhsKyYnGdYp5gp8X KID+8XmKtAcSwPUz+eG9vGlGwmP28mH0BfCT0suC2uUI4o+PJFPqBTlfsco2kfHO NqVCgnMZs31Js8mdEVz8h2ZO8m2T5m1oml1zOeyDbgTJ8yjqgADy8K6Lm38clko= =ZHtb -----END PGP SIGNATURE----- Merge tag 'for-linus-4.15-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip Pull xen fixes from Juergen Gross: "Just two small fixes for the new pvcalls frontend driver" * tag 'for-linus-4.15-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: xen/pvcalls: Fix a check in pvcalls_front_remove() xen/pvcalls: check for xenbus_read() errors
This commit is contained in:
commit
32abeb09ab
|
@ -1103,7 +1103,7 @@ static int pvcalls_front_remove(struct xenbus_device *dev)
|
|||
kfree(map);
|
||||
}
|
||||
}
|
||||
if (bedata->ref >= 0)
|
||||
if (bedata->ref != -1)
|
||||
gnttab_end_foreign_access(bedata->ref, 0, 0);
|
||||
kfree(bedata->ring.sring);
|
||||
kfree(bedata);
|
||||
|
@ -1128,6 +1128,8 @@ static int pvcalls_front_probe(struct xenbus_device *dev,
|
|||
}
|
||||
|
||||
versions = xenbus_read(XBT_NIL, dev->otherend, "versions", &len);
|
||||
if (IS_ERR(versions))
|
||||
return PTR_ERR(versions);
|
||||
if (!len)
|
||||
return -EINVAL;
|
||||
if (strcmp(versions, "1")) {
|
||||
|
|
Loading…
Reference in New Issue