diff --git a/[refs] b/[refs] index 35a269ca1940..8bf6cfeb7a2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2257d1224fa93875d472c21195b7817b0d7bcc50 +refs/heads/master: ef34dd184d58824f1cde7402afa8ba2a957029d9 diff --git a/trunk/drivers/staging/fwserial/fwserial.c b/trunk/drivers/staging/fwserial/fwserial.c index 258ac35fb5af..fe9a68854452 100644 --- a/trunk/drivers/staging/fwserial/fwserial.c +++ b/trunk/drivers/staging/fwserial/fwserial.c @@ -577,8 +577,11 @@ static int fwtty_buffer_rx(struct fwtty_port *port, unsigned char *d, size_t n) struct buffered_rx *buf; size_t size = (n + sizeof(struct buffered_rx) + 0xFF) & ~0xFF; - if (port->buffered + n > HIGH_WATERMARK) + if (port->buffered + n > HIGH_WATERMARK) { + fwtty_err_ratelimited(port, "overflowed rx buffer: buffered: %d new: %ld wtrmk: %d", + port->buffered, n, HIGH_WATERMARK); return 0; + } buf = kmalloc(size, GFP_ATOMIC); if (!buf) return 0;