Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20210316193820.3137-1-alex@ghiti.fr> <ee702ff7-f43c-745c-4157-b1cba53bb0b2@ghiti.fr>
In-Reply-To: <ee702ff7-f43c-745c-4157-b1cba53bb0b2@ghiti.fr>
From:   Rob Herring <robh+dt@kernel.org>
Date:   Tue, 6 Apr 2021 08:40:46 -0500
Message-ID: <CAL_JsqLeA2va05A78M893rAGoeMr-CztdiZouq-PSDFfsJ_-EA@mail.gmail.com>
Subject: Re: [PATCH] driver: of: Properly truncate command line if too long
To:     Alex Ghiti <alex@ghiti.fr>
Cc:     Frank Rowand <frowand.list@gmail.com>,
        Dmitry Vyukov <dvyukov@google.com>, devicetree@vger.kernel.org,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Sat, Apr 3, 2021 at 7:09 AM Alex Ghiti <alex@ghiti.fr> wrote:
>
> Hi,
>
> Le 3/16/21 =C3=A0 3:38 PM, Alexandre Ghiti a =C3=A9crit :
> > In case the command line given by the user is too long, warn about it
> > and truncate it to the last full argument.
> >
> > This is what efi already does in commit 80b1bfe1cb2f ("efi/libstub:
> > Don't parse overlong command lines").
> >
> > Reported-by: Dmitry Vyukov <dvyukov@google.com>
> > Signed-off-by: Alexandre Ghiti <alex@ghiti.fr>
> > ---
> >   drivers/of/fdt.c | 21 ++++++++++++++++++++-
> >   1 file changed, 20 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
> > index dcc1dd96911a..de4c6f9bac39 100644
> > --- a/drivers/of/fdt.c
> > +++ b/drivers/of/fdt.c
> > @@ -25,6 +25,7 @@
> >   #include <linux/serial_core.h>
> >   #include <linux/sysfs.h>
> >   #include <linux/random.h>
> > +#include <linux/ctype.h>
> >
> >   #include <asm/setup.h>  /* for COMMAND_LINE_SIZE */
> >   #include <asm/page.h>
> > @@ -1050,9 +1051,27 @@ int __init early_init_dt_scan_chosen(unsigned lo=
ng node, const char *uname,
> >
> >       /* Retrieve command line */
> >       p =3D of_get_flat_dt_prop(node, "bootargs", &l);
> > -     if (p !=3D NULL && l > 0)
> > +     if (p !=3D NULL && l > 0) {
> >               strlcpy(data, p, min(l, COMMAND_LINE_SIZE));
> >
> > +             /*
> > +              * If the given command line size is larger than
> > +              * COMMAND_LINE_SIZE, truncate it to the last complete
> > +              * parameter.
> > +              */
> > +             if (l > COMMAND_LINE_SIZE) {
> > +                     char *cmd_p =3D (char *)data + COMMAND_LINE_SIZE =
- 1;
> > +
> > +                     while (!isspace(*cmd_p))
> > +                             cmd_p--;
> > +
> > +                     *cmd_p =3D '\0';
> > +
> > +                     pr_err("Command line is too long: truncated to %d=
 bytes\n",
> > +                            (int)(cmd_p - (char *)data + 1));
> > +             }
> > +     }
> > +
> >       /*
> >        * CONFIG_CMDLINE is meant to be a default in case nothing else
> >        * managed to set the command line, unless CONFIG_CMDLINE_FORCE
> >
>
> Any thought about that ?

It looks fine to me, but this will need to be adapted to the generic
command line support[1][2] when that is merged. So I've been waiting
to see if that's going to happen this cycle.

Rob

[1] https://lore.kernel.org/lkml/cover.1616765869.git.christophe.leroy@csgr=
oup.eu/
[2] https://lore.kernel.org/lkml/41021d66db2ab427c14255d2a24bb4517c8b58fd.1=
617126961.git.danielwa@cisco.com/