From: Greg KH <greg@kroah.com>
To: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the tty tree
Date: Mon, 23 Jan 2023 18:52:44 +0100 [thread overview]
Message-ID: <Y87JbLHfRqAfQpHy@kroah.com> (raw)
In-Reply-To: <CACMJSevdzO7QuYqQ8B1QoAPC5CUW--+AeDm2dHbf1TGGL0=aMA@mail.gmail.com>
On Mon, Jan 23, 2023 at 10:46:28AM +0100, Bartosz Golaszewski wrote:
> On Mon, 23 Jan 2023 at 03:18, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > After merging the tty tree, today's linux-next build (x86_64 allmodconfig)
> > failed like this:
> >
> > drivers/tty/serial/qcom_geni_serial.c: In function 'setup_fifos':
> > drivers/tty/serial/qcom_geni_serial.c:1058:17: error: 'struct qcom_geni_serial_port' has no member named 'rx_fifo'
> > 1058 | if (port->rx_fifo && (old_rx_fifo_depth != port->rx_fifo_depth) && port->rx_fifo_depth) {
> > | ^~
> > drivers/tty/serial/qcom_geni_serial.c:1059:21: error: 'struct qcom_geni_serial_port' has no member named 'rx_fifo'
> > 1059 | port->rx_fifo = devm_krealloc(uport->dev, port->rx_fifo,
> > | ^~
> > drivers/tty/serial/qcom_geni_serial.c:1059:63: error: 'struct qcom_geni_serial_port' has no member named 'rx_fifo'
> > 1059 | port->rx_fifo = devm_krealloc(uport->dev, port->rx_fifo,
> > | ^~
> > drivers/tty/serial/qcom_geni_serial.c:1062:26: error: 'struct qcom_geni_serial_port' has no member named 'rx_fifo'
> > 1062 | if (!port->rx_fifo)
> > | ^~
> >
> > Caused by commit
> >
> > 2aaa43c70778 ("tty: serial: qcom-geni-serial: add support for serial engine DMA")
> >
> > interacting with commit
> >
> > b8caf69a6946 ("tty: serial: qcom-geni-serial: fix slab-out-of-bounds on RX FIFO buffer")
> >
> > from Linus' tree.
> >
> > I have applied the following merge fix patch for today (I am not sure
> > if it is actually correct, but it builds).
> >
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Mon, 23 Jan 2023 13:09:27 +1100
> > Subject: [PATCH] tty: fix up for "tty: serial: qcom-geni-serial: add support
> > for serial engine DMA"
> >
> > interacting with "tty: serial: qcom-geni-serial: fix slab-out-of-bounds
> > on RX FIFO buffer".
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> > drivers/tty/serial/qcom_geni_serial.c | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c
> > index d98e0a8aae7c..61350007bf1c 100644
> > --- a/drivers/tty/serial/qcom_geni_serial.c
> > +++ b/drivers/tty/serial/qcom_geni_serial.c
> > @@ -1055,11 +1055,11 @@ static int setup_fifos(struct qcom_geni_serial_port *port)
> > uport->fifosize =
> > (port->tx_fifo_depth * port->tx_fifo_width) / BITS_PER_BYTE;
> >
> > - if (port->rx_fifo && (old_rx_fifo_depth != port->rx_fifo_depth) && port->rx_fifo_depth) {
> > - port->rx_fifo = devm_krealloc(uport->dev, port->rx_fifo,
> > + if (port->rx_buf && (old_rx_fifo_depth != port->rx_fifo_depth) && port->rx_fifo_depth) {
> > + port->rx_buf = devm_krealloc(uport->dev, port->rx_buf,
> > port->rx_fifo_depth * sizeof(u32),
> > GFP_KERNEL);
> > - if (!port->rx_fifo)
> > + if (!port->rx_buf)
> > return -ENOMEM;
> > }
> >
> > --
> > 2.35.1
> >
> > --
> > Cheers,
> > Stephen Rothwell
>
> This looks fine and works fine:
>
> Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> Tested-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Thanks for this, someone else just sent the same thing, I've queued it
up too.
greg k-h
next prev parent reply other threads:[~2023-01-23 17:52 UTC|newest]
Thread overview: 102+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-23 2:18 linux-next: build failure after merge of the tty tree Stephen Rothwell
2023-01-23 9:46 ` Bartosz Golaszewski
2023-01-23 17:52 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-04-11 5:48 Stephen Rothwell
2024-04-11 5:59 ` Tony Lindgren
2022-08-02 20:06 broonie
2022-08-02 20:27 ` Doug Anderson
2022-08-03 6:10 ` Greg KH
2019-06-13 5:32 Stephen Rothwell
2019-06-13 6:10 ` Greg KH
2018-10-04 5:19 Stephen Rothwell
2018-10-04 16:34 ` Steve Sakoman
2018-10-04 17:00 ` Greg Kroah-Hartman
2018-10-04 17:13 ` Steve Sakoman
2018-10-04 18:13 ` Steve Sakoman
2018-10-04 18:22 ` Greg Kroah-Hartman
2018-09-11 2:58 Stephen Rothwell
2018-09-11 8:23 ` Greg KH
2018-09-11 8:25 ` Lee Jones
2018-09-11 8:32 ` Nicolas Ferre
2018-09-11 8:43 ` Lee Jones
2018-09-18 4:54 ` Andy Shevchenko
2017-12-18 3:28 Stephen Rothwell
2017-12-18 8:52 ` Geert Uytterhoeven
2017-12-18 9:02 ` Greg KH
2017-12-18 9:33 ` Greg KH
2017-02-06 4:22 Stephen Rothwell
2017-02-06 8:51 ` Greg KH
2017-02-06 14:09 ` Rob Herring
2017-02-06 15:18 ` Greg KH
2017-02-06 20:38 ` Stephen Rothwell
2016-09-30 3:54 Stephen Rothwell
2016-09-30 5:46 ` Greg KH
2015-08-18 6:01 Stephen Rothwell
2015-08-18 16:12 ` Greg KH
2015-05-11 5:16 Stephen Rothwell
2015-05-11 10:42 ` Dave Martin
2014-09-30 7:39 Stephen Rothwell
2014-09-30 7:52 ` Sebastian Andrzej Siewior
2014-09-30 8:09 ` Stephen Rothwell
2014-09-25 6:30 Stephen Rothwell
2014-09-25 11:04 ` Greg KH
2014-05-29 7:28 Stephen Rothwell
[not found] ` <5EB3BFCD089AD643B9BB63439F5FD5E9012BF05ED1@SHAASIEXM01.ASIA.ROOT.PRI>
2014-05-29 12:29 ` Barry Song
2013-10-31 7:40 Stephen Rothwell
2013-10-31 10:35 ` Sedat Dilek
2013-10-31 13:09 ` Philippe Proulx
2013-10-31 13:24 ` Greg KH
2013-07-24 4:42 Stephen Rothwell
2013-07-24 13:29 ` Peter Hurley
2013-05-21 3:25 Stephen Rothwell
2013-03-20 3:12 Stephen Rothwell
2013-03-20 8:17 ` Jiri Slaby
2013-03-20 12:51 ` Bill Pemberton
2013-03-20 14:17 ` Jiri Slaby
2013-03-20 14:42 ` Bill Pemberton
2013-03-20 15:13 ` Jiri Slaby
2013-03-20 15:15 ` Bill Pemberton
2013-03-21 0:16 ` Greg KH
2013-03-21 22:54 ` Stephen Rothwell
2013-03-21 23:28 ` Stephen Rothwell
2013-03-21 23:47 ` Greg KH
2013-03-22 0:42 ` Stephen Rothwell
2013-03-21 23:36 ` Greg KH
2013-03-21 4:20 ` Stephen Rothwell
2012-10-24 2:28 Stephen Rothwell
2012-10-24 2:51 ` Greg KH
2012-09-06 5:10 Stephen Rothwell
2012-09-06 11:47 ` Alan Cox
2012-07-20 3:33 Stephen Rothwell
2012-07-25 22:51 ` Stephen Rothwell
2012-07-26 0:25 ` Alan Cox
2012-07-20 3:28 Stephen Rothwell
2012-07-25 22:47 ` Greg KH
2012-07-25 22:49 ` Stephen Rothwell
2012-07-19 4:36 Stephen Rothwell
2012-07-19 10:41 ` Alan Cox
2012-07-17 3:45 Stephen Rothwell
2012-07-17 10:10 ` Alan Cox
2012-07-17 15:45 ` Greg KH
2012-07-17 15:45 ` Greg KH
2012-07-17 16:05 ` Alan Cox
2012-07-13 4:13 Stephen Rothwell
2012-07-13 11:10 ` Alan Cox
2012-07-20 18:38 ` Geert Uytterhoeven
2012-07-20 20:55 ` Alan Cox
2012-07-20 21:06 ` Geert Uytterhoeven
2012-04-10 3:06 Stephen Rothwell
2011-08-24 4:33 Stephen Rothwell
2011-08-24 4:50 ` Greg KH
2011-02-24 5:40 Stephen Rothwell
2011-02-25 17:54 ` Greg KH
2010-09-23 4:20 Stephen Rothwell
2010-09-23 14:14 ` Greg KH
2010-09-23 15:13 ` Randy Dunlap
2010-09-23 15:46 ` Alan Cox
2010-09-23 17:12 ` Alan Cox
2010-09-23 17:13 ` Randy Dunlap
2010-07-27 5:18 Stephen Rothwell
2010-07-27 7:43 ` Alan Cox
2010-07-27 16:47 ` Greg KH
2010-07-28 1:19 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y87JbLHfRqAfQpHy@kroah.com \
--to=greg@kroah.com \
--cc=bartosz.golaszewski@linaro.org \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).