From owner-svn-src-head@freebsd.org Sun Nov 18 12:25:13 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CCC501138651; Sun, 18 Nov 2018 12:25:13 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1902F7B04F; Sun, 18 Nov 2018 12:25:13 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) Received: by mail-pl1-f181.google.com with SMTP id t13so10286093ply.13; Sun, 18 Nov 2018 04:25:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=zm67hAfiltA3xmqiIx+t0QwQPvS4140QtBBlrORR9Ls=; b=amJKMjNHRibX+YgJB0ufatGZsr57HaAEr4chHWmG2Clgx2jt3+Swi9y4Vcxvu8sPLx Np25/cZTqtFW3eN2hmR2Whi8Z8uFt7KSd5n3MWjk2Apl6Cb62dSEVkQSrFXdGQjNm9A4 HKTiEUbwKmhDfadrG6iH2oq0YxGjmyIHqtdgMf7NfGHzqnkOzPbkseDwFRSqiv5g5siM 0Qyy4eq1GqYbA/YN+ReG2nDWVwnQPlqoULb+2fnqoniAJhKSx7gkkUaJBeD2k0c89/Uf 0bjkQx3QlP0hGOKrgOEUjWMZ4xO5CEuccnI1WGdDtXqK2CIADeNPVjRwFBt+QlpIdZ1s cbIQ== X-Gm-Message-State: AGRZ1gJRrelojc0smz2QZg0RAEBvws5qJSgHtBK15rSv5VV7TeJE8kMW u57L35avgsBRY+Aq6NlJ0QlJr4fsjC5CvMDKE0ga6X9Y X-Google-Smtp-Source: AJdET5cEQcg7+deqHqfSyjJZE8t+5aOP1KlvqEQvBxCNtqAdkRRhnQEr/p+YBNpDiMUJnKxaBB/J37nZ76r8eeJtmZM= X-Received: by 2002:a17:902:bb0a:: with SMTP id l10-v6mr18631463pls.230.1542543905845; Sun, 18 Nov 2018 04:25:05 -0800 (PST) MIME-Version: 1.0 References: <201811181223.wAICN3co058518@repo.freebsd.org> In-Reply-To: <201811181223.wAICN3co058518@repo.freebsd.org> From: Mariusz Zaborski Date: Sun, 18 Nov 2018 13:25:02 +0100 Message-ID: Subject: Re: svn commit: r340572 - head/usr.bin/brandelf To: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 1902F7B04F X-Spamd-Result: default: False [-1.91 / 15.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[181.214.85.209.rep.mailspike.net : 127.0.0.18]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.84)[-0.836,0]; RCVD_IN_DNSWL_NONE(0.00)[181.214.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.06)[ipnet: 209.85.128.0/17(-3.47), asn: 15169(-1.74), country: US(-0.09)]; FORGED_SENDER(0.30)[oshogbo@freebsd.org,oshogbovx@gmail.com]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TAGGED_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[oshogbo@freebsd.org,oshogbovx@gmail.com]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Nov 2018 12:25:14 -0000 Reviewed by: emaste, markj, allanjude Differential Revision: https://reviews.freebsd.org/D17967 On Sun, 18 Nov 2018 at 13:23, Mariusz Zaborski wrote: > > Author: oshogbo > Date: Sun Nov 18 12:23:03 2018 > New Revision: 340572 > URL: https://svnweb.freebsd.org/changeset/base/340572 > > Log: > brandelf: capsicumize it > > Modified: > head/usr.bin/brandelf/Makefile > head/usr.bin/brandelf/brandelf.c > > Modified: head/usr.bin/brandelf/Makefile > ============================================================================== > --- head/usr.bin/brandelf/Makefile Sun Nov 18 12:09:27 2018 (r340571) > +++ head/usr.bin/brandelf/Makefile Sun Nov 18 12:23:03 2018 (r340572) > @@ -1,5 +1,13 @@ > # $FreeBSD$ > > +.include > + > PROG= brandelf > + > +.if ${MK_CASPER} != "no" > +LIBADD+= casper > +LIBADD+= cap_fileargs > +CFLAGS+= -DWITH_CASPER > +.endif > > .include > > Modified: head/usr.bin/brandelf/brandelf.c > ============================================================================== > --- head/usr.bin/brandelf/brandelf.c Sun Nov 18 12:09:27 2018 (r340571) > +++ head/usr.bin/brandelf/brandelf.c Sun Nov 18 12:23:03 2018 (r340572) > @@ -33,9 +33,11 @@ > __FBSDID("$FreeBSD$"); > > #include > +#include > #include > #include > > +#include > #include > #include > #include > @@ -44,6 +46,9 @@ __FBSDID("$FreeBSD$"); > #include > #include > > +#include > +#include > + > static int elftype(const char *); > static const char *iselftype(int); > static void printelftypes(void); > @@ -66,8 +71,10 @@ main(int argc, char **argv) > { > > const char *strtype = "FreeBSD"; > - int ch, retval, type; > + int ch, flags, retval, type; > bool change, force, listed; > + fileargs_t *fa; > + cap_rights_t rights; > > type = ELFOSABI_FREEBSD; > retval = 0; > @@ -121,11 +128,24 @@ main(int argc, char **argv) > usage(); > } > > + flags = change || force ? O_RDWR : O_RDONLY; > + cap_rights_init(&rights, CAP_READ, CAP_SEEK); > + if (flags == O_RDWR) > + cap_rights_set(&rights, CAP_WRITE); > + > + fa = fileargs_init(argc, argv, flags, 0, &rights); > + if (fa == NULL) > + errx(1, "unable to init casper"); > + > + caph_cache_catpages(); > + if (caph_limit_stdio() < 0 || caph_enter_casper() < 0) > + err(1, "unable to enter capability mode"); > + > while (argc != 0) { > int fd; > char buffer[EI_NIDENT]; > > - if ((fd = open(argv[0], change || force ? O_RDWR : O_RDONLY, 0)) < 0) { > + if ((fd = fileargs_open(fa, argv[0])) < 0) { > warn("error opening file %s", argv[0]); > retval = 1; > goto fail; > @@ -167,6 +187,7 @@ fail: > argv++; > } > > + fileargs_free(fa); > return (retval); > } > > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org"