Merge tag 'for-linus-5.15b-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / tty / hvc / hvc_xen.c

diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index f1c99b4..f0bf01e 100644 (file)
--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -86,7 +86,11 @@ static int __write_console(struct xencons_info *xencons,
        cons = intf->out_cons;
        prod = intf->out_prod;
        mb();                   /* update queue values before going on */
-       BUG_ON((prod - cons) > sizeof(intf->out));
+
+       if ((prod - cons) > sizeof(intf->out)) {
+               pr_err_once("xencons: Illegal ring page indices");
+               return -EINVAL;
+       }
 
        while ((sent < len) && ((prod - cons) < sizeof(intf->out)))
                intf->out[MASK_XENCONS_IDX(prod++, intf->out)] = data[sent++];
@@ -114,7 +118,10 @@ static int domU_write_console(uint32_t vtermno, const char *data, int len)
         */
        while (len) {
                int sent = __write_console(cons, data, len);
-               
+
+               if (sent < 0)
+                       return sent;
+
                data += sent;
                len -= sent;
 
@@ -138,7 +145,11 @@ static int domU_read_console(uint32_t vtermno, char *buf, int len)
        cons = intf->in_cons;
        prod = intf->in_prod;
        mb();                   /* get pointers before reading ring */
-       BUG_ON((prod - cons) > sizeof(intf->in));
+
+       if ((prod - cons) > sizeof(intf->in)) {
+               pr_err_once("xencons: Illegal ring page indices");
+               return -EINVAL;
+       }
 
        while (cons != prod && recv < len)
                buf[recv++] = intf->in[MASK_XENCONS_IDX(cons++, intf->in)];