Merge tag 'for-linus-4.15-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Linus Torvalds 8 years ago 32abeb09 d90696ed

+3 -1

1 changed file

expand all

drivers

xen

pvcalls-front.c

+3 -1

drivers/xen/pvcalls-front.c

··· 1103 1103 kfree(map); 1104 1104 } 1105 1105 } 1106 - if (bedata->ref >= 0) 1106 + if (bedata->ref != -1) 1107 1107 gnttab_end_foreign_access(bedata->ref, 0, 0); 1108 1108 kfree(bedata->ring.sring); 1109 1109 kfree(bedata); ··· 1128 1128 } 1129 1129 1130 1130 versions = xenbus_read(XBT_NIL, dev->otherend, "versions", &len); 1131 + if (IS_ERR(versions)) 1132 + return PTR_ERR(versions); 1131 1133 if (!len) 1132 1134 return -EINVAL; 1133 1135 if (strcmp(versions, "1")) {