Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 15 Apr 2019 04:42:46 +0200
From:      Mariusz Zaborski <oshogbo@freebsd.org>
To:        Adrian Chadd <adrian.chadd@gmail.com>
Cc:        src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   Re: svn commit: r345875 - in head: contrib/elftoolchain/strings usr.bin/strings
Message-ID:  <20190415024246.GA36864@x-wing>
In-Reply-To: <CAJ-Vmon=bjqSHP0c2LQ6gUAQeLfA=XkQCDsXQvCRiCORTYOUpg@mail.gmail.com>
References:  <201904041632.x34GWR4Z006164@repo.freebsd.org> <CAJ-Vmon=bjqSHP0c2LQ6gUAQeLfA=XkQCDsXQvCRiCORTYOUpg@mail.gmail.com>

next in thread | previous in thread | raw e-mail | index | archive | help

--IS0zKkzwUGydFO0o
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Apr 14, 2019 at 08:19:22AM -0700, Adrian Chadd wrote:
> This exposed a fun bug - gcc mips 6.4.0 complains about an unused arg (fa)
> in fileargs_fopen() in the strings change when you compile without casper
> support. I do that on mips.
>=20
> I have a local change that converts the #define to an inline function so
> the unused arg can be (void)'ed away. Mind if I commit it?
Sounds good to me.
Although you don't have an issue with others services?

--=20
Mariusz Zaborski
oshogbo//vx		| http://oshogbo.vexillium.org
FreeBSD committer	| https://freebsd.org
Software developer	| http://wheelsystems.com
If it's not broken, let's fix it till it is!!1

>=20
> On Thu, 4 Apr 2019 at 09:32, Mariusz Zaborski <oshogbo@freebsd.org> wrote:
>=20
> > Author: oshogbo
> > Date: Thu Apr  4 16:32:27 2019
> > New Revision: 345875
> > URL: https://svnweb.freebsd.org/changeset/base/345875
> >
> > Log:
> >   strings: capsicumize it
> >
> >   Reviewed by:  cem
> >   Discussed with: emaste
> >   Differential Revision:        https://reviews.freebsd.org/D18038
> >
> > Modified:
> >   head/contrib/elftoolchain/strings/strings.c
> >   head/usr.bin/strings/Makefile
> >
> > Modified: head/contrib/elftoolchain/strings/strings.c
> >
> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D
> > --- head/contrib/elftoolchain/strings/strings.c Thu Apr  4 12:02:48 2019
> >       (r345874)
> > +++ head/contrib/elftoolchain/strings/strings.c Thu Apr  4 16:32:27 2019
> >       (r345875)
> > @@ -25,8 +25,10 @@
> >   */
> >
> >  #include <sys/types.h>
> > +#include <sys/capsicum.h>
> >  #include <sys/stat.h>
> >
> > +#include <capsicum_helpers.h>
> >  #include <ctype.h>
> >  #include <err.h>
> >  #include <errno.h>
> > @@ -44,6 +46,9 @@
> >  #include <libelftc.h>
> >  #include <gelf.h>
> >
> > +#include <libcasper.h>
> > +#include <casper/cap_fileargs.h>
> > +
> >  #include "_elftc.h"
> >
> >  ELFTC_VCSID("$Id: strings.c 3648 2018-11-22 23:26:43Z emaste $");
> > @@ -85,7 +90,7 @@ static struct option strings_longopts[] =3D {
> >  };
> >
> >  int    getcharacter(FILE *, long *);
> > -int    handle_file(const char *);
> > +int    handle_file(fileargs_t *fa, const char *);
> >  int    handle_elf(const char *, FILE *);
> >  int    handle_binary(const char *, FILE *, size_t);
> >  int    find_strings(const char *, FILE *, off_t, off_t);
> > @@ -99,6 +104,8 @@ void usage(void);
> >  int
> >  main(int argc, char **argv)
> >  {
> > +       fileargs_t *fa;
> > +       cap_rights_t rights;
> >         int ch, rc;
> >
> >         rc =3D 0;
> > @@ -187,27 +194,41 @@ main(int argc, char **argv)
> >         argc -=3D optind;
> >         argv +=3D optind;
> >
> > +       cap_rights_init(&rights, CAP_READ, CAP_SEEK, CAP_FSTAT, CAP_FCN=
TL);
> > +       fa =3D fileargs_init(argc, argv, O_RDONLY, 0, &rights);
> > +       if (fa =3D=3D NULL)
> > +               err(1, "Unable to initialize casper fileargs");
> > +
> > +       caph_cache_catpages();
> > +       if (caph_limit_stdio() < 0 && caph_enter_casper() < 0) {
> > +               fileargs_free(fa);
> > +               err(1, "Unable to enter capability mode");
> > +       }
> > +
> >         if (min_len =3D=3D 0)
> >                 min_len =3D 4;
> >         if (*argv =3D=3D NULL)
> >                 rc =3D find_strings("{standard input}", stdin, 0, 0);
> >         else while (*argv !=3D NULL) {
> > -               if (handle_file(*argv) !=3D 0)
> > +               if (handle_file(fa, *argv) !=3D 0)
> >                         rc =3D 1;
> >                 argv++;
> >         }
> > +
> > +       fileargs_free(fa);
> > +
> >         return (rc);
> >  }
> >
> >  int
> > -handle_file(const char *name)
> > +handle_file(fileargs_t *fa, const char *name)
> >  {
> >         FILE *pfile;
> >         int rt;
> >
> >         if (name =3D=3D NULL)
> >                 return (1);
> > -       pfile =3D fopen(name, "rb");
> > +       pfile =3D fileargs_fopen(fa, name, "rb");
> >         if (pfile =3D=3D NULL) {
> >                 warnx("'%s': %s", name, strerror(errno));
> >                 return (1);
> >
> > Modified: head/usr.bin/strings/Makefile
> >
> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D
> > --- head/usr.bin/strings/Makefile       Thu Apr  4 12:02:48 2019
> > (r345874)
> > +++ head/usr.bin/strings/Makefile       Thu Apr  4 16:32:27 2019
> > (r345875)
> > @@ -10,6 +10,12 @@ PROG=3D        strings
> >
> >  LIBADD=3D        elftc elf
> >
> > +.if ${MK_CASPER} !=3D "no" && !defined(BOOTSTRAPPING)
> > +LIBADD+=3D       casper
> > +LIBADD+=3D       cap_fileargs
> > +CFLAGS+=3D       -DWITH_CASPER
> > +.endif
> > +
> >  CFLAGS+=3D-I${ELFTCDIR}/libelftc -I${ELFTCDIR}/common
> >
> >  .include <bsd.prog.mk>
> >
> >

--IS0zKkzwUGydFO0o
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEkD1x0xkJXVVY1Gwf38KEGuLGxWQFAlyz758ACgkQ38KEGuLG
xWR1Qg/8C64XwBxmWoPJOFc+NN4scD6Pczcy8vBknNSuCK2T3++axg8sLJjiIPuP
FmTekAnACu1pZe4WdnirO0mXvB/4sSp/uhvPacGXOhCcfsmgSKuKJIfZt4wqKqrU
fv108NyKpLaLXrV9c/8N5Fu7p44aduJxpdkzJcSq0cwTNKOxGVsrDYpfC7o4r0e0
bthYQfhyc9JlMwj75mPTh/DQnwwbpZ6dNodigWSsF4ujvCexjj1pcMefo3IMc88P
zYD5hJ9JHZKnIwhbMRpuML4MP1+EHyV3uCxQ1aWekDTltkULzJ8KHaguL+1oWUYL
CW9SsnPVcpRmGLK/JOrG5SFnCm2OttIZOnhriMS+LRIhXd+f6J6I5VsgITJbnCbu
E+Suo514UOxhInuBODJEGfiUYoJmTM2nOPisNsNE3N/x2ToRW+O1gDA02lL9btRC
uSKObJ72FL2Lkmru1LsJz/Z9uGN09o6gSJKrI3DB8QJxlBJeJqUxwNFY8XmAJuaE
TRChi7OHQGmH6Ira0s+qUnhFW+jM7hRswe8Q9YD16yKLoY25AQAOn+0ez3BBKqJk
LwGa5xQR9M9ItUsvJW2HGYKmhSqHIVtvjsrI1sANWYYUIK/WMIo8TN4ISEsNjpLe
4P6r9mCA8U1ZMt9dm8dMoovh3QShkMELrApJfWZCmX6w+z2QdWw=
=ClwG
-----END PGP SIGNATURE-----

--IS0zKkzwUGydFO0o--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20190415024246.GA36864>