From nobody Fri Feb 18 01:51:43 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B54F219C1DDF; Fri, 18 Feb 2022 01:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K0F6m2sJGz4bvC; Fri, 18 Feb 2022 01:51:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645149104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RI3FlBfOqUf90qgO0ofnEAHIajPqsd98OuJ9xvZSJ+c=; b=YkACjUJcuX68b0TA+huoW0R8zKmMT4e3/Rt4v1hcqgmg5tU/8jpiQbUSCfW7t8lPe6Q35d YvzDjrEPAyXakba0QO/sFtLNk7Uh+CkO0J/sm892Bc3gBMjUQjGcZ8Zxd6zhOda5KqjLlt VrClEWM3aE2bsKGQNtTJAgA2YnbEJWHPtSFw3sLEQStb4bK+40NvQkGRTF/ag9366edWA/ B1NJNetLkWDvzCoXoNx+hheitemTOxmI8MuiIm4XNbD2McEaq8oukR1RRWKC3TOGnN2FcJ A/4rmlbmLnW6B51cYWId/M+tGSfVdO+CM+flvKhqOxwCdR082vHmfDWMSLURLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D377D14C73; Fri, 18 Feb 2022 01:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21I1ph9D026255; Fri, 18 Feb 2022 01:51:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21I1ph5I026254; Fri, 18 Feb 2022 01:51:43 GMT (envelope-from git) Date: Fri, 18 Feb 2022 01:51:43 GMT Message-Id: <202202180151.21I1ph5I026254@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d3cbb4745a13 - stable/12 - elfctl: fix operations with multiple features on multiple files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: d3cbb4745a13d5155597e66281efa05cb6a7c72a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645149104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RI3FlBfOqUf90qgO0ofnEAHIajPqsd98OuJ9xvZSJ+c=; b=H0Re3U35zQofYpqOAT4rR4/EPpli4ktyvIKjKj6txoDTlxuTZi7ajNHCu8YVbqX51htlUM vzVUVBjv1pV7JGL+spDk5PbqXZ/JrCx19751yWwusZ1Cf/L/1YxEm/Dbj4oc+2xsSegMlZ 9oDWG7KAjllAv15Om7gAiV3svg+t/Xauop2XEJgaqa7N6mSzXwIHRdNM8xOYYdEP3+ZJQZ k+NoDog+ORXO/o1QHT4jNvlywVsIh8yZyblCxECOP2zX6a9Km+hyvbykXdEPLCOvkVbx5l sj5OswA7hvs+gEkCbQne6EvIF5e5tVJbOMVP/sNTrfc6Lmqv9tEIgs58dqAdeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645149104; a=rsa-sha256; cv=none; b=URJ363ayQAkHPYzs13wFdLKnMto9vrwNtuCBUsE43KO7i5FzAyu2FnB6SmseOlSTSsMyJY NWualv1Z4hib+3NEXnOSQ6KlxbgNu5wE5MtqGFejyH6GDUi9za3Mysdbx2Lw2J0F6kcCgy JmJjdBtEZaeeFowxO/lX1xkRogz06+rqZZezYg+z70Un8LWQEFUTuln6U4o4QwIPWiB2Jz DpOXKs2cOikjUYBhCorLZVIug8UlKhLoh+SDZy0e7gSKVTTF+80XGRg5x9w1cK2dy9ZFvI wbEk0jQeB5CEk2cDd0IjmJTMXplhN7retUZC/6cmCPbDCAAyXdDE1N5seoJ5vA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d3cbb4745a13d5155597e66281efa05cb6a7c72a commit d3cbb4745a13d5155597e66281efa05cb6a7c72a Author: Ed Maste AuthorDate: 2022-02-15 03:44:01 +0000 Commit: Ed Maste CommitDate: 2022-02-18 00:33:47 +0000 elfctl: fix operations with multiple features on multiple files Previously an invocation like elfctl -e +feature1,feature2 file1 file2 would set both feature flags in file 1 but only feature1 in file2 (due to the string being modified by strsep()). Reported by: jrm Tested by: jrm MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34283 (cherry picked from commit 82b611ed18e6bfaeadf152ef9216230548c25a8a) --- usr.bin/elfctl/elfctl.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/usr.bin/elfctl/elfctl.c b/usr.bin/elfctl/elfctl.c index b4482f82e7ef..eeade6ac371c 100644 --- a/usr.bin/elfctl/elfctl.c +++ b/usr.bin/elfctl/elfctl.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); -static bool convert_to_feature_val(char *, uint32_t *); +static bool convert_to_feature_val(const char *, uint32_t *); static bool edit_file_features(Elf *, int, int, char *, bool); static bool get_file_features(Elf *, int, int, uint32_t *, uint64_t *, bool); static void print_features(void); @@ -226,9 +226,9 @@ usage(void) } static bool -convert_to_feature_val(char *feature_str, uint32_t *feature_val) +convert_to_feature_val(const char *feature_str, uint32_t *feature_val) { - char *feature; + char *feature, *feature_tmp; int i, len; uint32_t input; char operation; @@ -240,8 +240,10 @@ convert_to_feature_val(char *feature_str, uint32_t *feature_val) if (operation != '+' && operation != '-' && operation != '=') errx(1, "'%c' not an operator - use '+', '-', '='", operation); + if ((feature_tmp = strdup(feature_str)) == NULL) + err(1, "strdup"); len = nitems(featurelist); - while ((feature = strsep(&feature_str, ",")) != NULL) { + while ((feature = strsep(&feature_tmp, ",")) != NULL) { for (i = 0; i < len; ++i) { if (strcmp(featurelist[i].alias, feature) == 0) { input |= featurelist[i].value; @@ -271,13 +273,16 @@ convert_to_feature_val(char *feature_str, uint32_t *feature_val) errno = ERANGE; if (errno != 0) { warn("%s invalid", feature); + free(feature_tmp); return (false); } input |= val; } else { warnx("%s is not a valid feature", feature); - if (!iflag) + if (!iflag) { + free(feature_tmp); return (false); + } } } } @@ -289,6 +294,7 @@ convert_to_feature_val(char *feature_str, uint32_t *feature_val) } else if (operation == '-') { *feature_val &= ~input; } + free(feature_tmp); return (true); }