From owner-svn-src-head@freebsd.org Mon May 20 05:00:09 2019 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 4FE6815A1831; Mon, 20 May 2019 05:00:09 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A62F98BE84; Mon, 20 May 2019 05:00:08 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x4K506kU072318; Sun, 19 May 2019 22:00:06 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x4K506YI072317; Sun, 19 May 2019 22:00:06 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201905200500.x4K506YI072317@gndrsh.dnsmgr.net> Subject: Re: svn commit: r347980 - head/lib/libsecureboot/openpgp In-Reply-To: <201905192024.x4JKOIZe086856@repo.freebsd.org> To: "Simon J. Gerraty" Date: Sun, 19 May 2019 22:00:06 -0700 (PDT) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: A62F98BE84 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.93 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.93)[-0.933,0] 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: Mon, 20 May 2019 05:00:09 -0000 [ Charset UTF-8 unsupported, converting... ] > Author: sjg > Date: Sun May 19 20:24:17 2019 > New Revision: 347980 > URL: https://svnweb.freebsd.org/changeset/base/347980 > > Log: > load_key_buf do not free data from dearmor > > The data returned by dearmor is referenced by the key > leave it alone! > > Reviewed by: stevek > MFC after: 2 days This is an exception below the standard minimal limit during a code freeze, is there some reason for it? The next build should not be started before 3 days. > Modified: > head/lib/libsecureboot/openpgp/opgp_key.c > head/lib/libsecureboot/openpgp/opgp_sig.c > > Modified: head/lib/libsecureboot/openpgp/opgp_key.c > ============================================================================== > --- head/lib/libsecureboot/openpgp/opgp_key.c Sun May 19 20:13:55 2019 (r347979) > +++ head/lib/libsecureboot/openpgp/opgp_key.c Sun May 19 20:24:17 2019 (r347980) > @@ -168,6 +168,7 @@ load_key_buf(unsigned char *buf, size_t nbytes) > initialize(); > > if (!(buf[0] & OPENPGP_TAG_ISTAG)) { > + /* Note: we do *not* free data */ > data = dearmor((char *)buf, nbytes, &nbytes); > ptr = data; > } else > @@ -190,7 +191,6 @@ load_key_buf(unsigned char *buf, size_t nbytes) > } > } > } > - free(data); > return (key); > } > > @@ -209,8 +209,10 @@ openpgp_trust_add(OpenPGP_key *key) > > LIST_INIT(&trust_list); > } > - if (key) > + if (key) { > + DEBUG_PRINTF(2, ("openpgp_trust_add(%s)\n", key->id)); > LIST_INSERT_HEAD(&trust_list, key, entries); > + } > } > > /** > @@ -296,6 +298,7 @@ load_key_id(const char *keyID) > if (!key) > key = load_trusted_key_id(keyID); > #endif > + DEBUG_PRINTF(2, ("load_key_id(%s): %s\n", keyID, key ? "found" : "nope")); > return (key); > } > > > Modified: head/lib/libsecureboot/openpgp/opgp_sig.c > ============================================================================== > --- head/lib/libsecureboot/openpgp/opgp_sig.c Sun May 19 20:13:55 2019 (r347979) > +++ head/lib/libsecureboot/openpgp/opgp_sig.c Sun May 19 20:24:17 2019 (r347980) > @@ -318,6 +318,7 @@ openpgp_verify(const char *filename, > sdata = ddata = dearmor((char *)sdata, sbytes, &sbytes); > ptr = sdata; > rc = decode_packet(2, &ptr, sbytes, (decoder_t)decode_sig, sig); > + DEBUG_PRINTF(2, ("rc=%d keyID=%s\n", rc, sig->key_id ? sig->key_id : "?")); > if (rc == 0 && sig->key_id) { > key = load_key_id(sig->key_id); > if (!key) { > > -- Rod Grimes rgrimes@freebsd.org