From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67F62C76186 for ; Tue, 23 Jul 2019 22:59:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 44F0B21926 for ; Tue, 23 Jul 2019 22:59:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728966AbfGWW7e (ORCPT ); Tue, 23 Jul 2019 18:59:34 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:2582 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728418AbfGWW7e (ORCPT ); Tue, 23 Jul 2019 18:59:34 -0400 Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x6NMv0ng112474 for ; Tue, 23 Jul 2019 18:59:33 -0400 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2tx8vddqx1-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 23 Jul 2019 18:59:32 -0400 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 23 Jul 2019 23:59:31 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 23 Jul 2019 23:59:28 +0100 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x6NMxRZr52101136 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 23 Jul 2019 22:59:27 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8CF3811C054; Tue, 23 Jul 2019 22:59:27 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1F93211C052; Tue, 23 Jul 2019 22:59:27 +0000 (GMT) Received: from localhost.localdomain (unknown [9.80.82.157]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 23 Jul 2019 22:59:26 +0000 (GMT) Subject: Re: [PATCH v3 2/2] ima-evm-utils: log unknown keyid's as errors From: Mimi Zohar To: Vitaly Chikunov Cc: linux-integrity@vger.kernel.org Date: Tue, 23 Jul 2019 18:59:16 -0400 In-Reply-To: <20190723221801.ycvdj5eajlrozxf6@altlinux.org> References: <1563460194-21569-1-git-send-email-zohar@linux.ibm.com> <1563460194-21569-2-git-send-email-zohar@linux.ibm.com> <20190723221801.ycvdj5eajlrozxf6@altlinux.org> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.20.5 (3.20.5-1.fc24) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 19072322-0020-0000-0000-000003568884 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19072322-0021-0000-0000-000021AA7542 Message-Id: <1563922756.4294.16.camel@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-07-23_09:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1907230235 Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org On Wed, 2019-07-24 at 01:18 +0300, Vitaly Chikunov wrote: > Mimi, > > On Thu, Jul 18, 2019 at 10:29:54AM -0400, Mimi Zohar wrote: > > Each tima a new unknown key is encountered, emit a message of the format > > "key #: unknown". The individual files using unknown keys are > > then only logged in verbose mode. > > > > Signed-off-by: Mimi Zohar > > --- > > src/libimaevm.c | 21 +++++++++++++++++---- > > 1 file changed, 17 insertions(+), 4 deletions(-) > > > > diff --git a/src/libimaevm.c b/src/libimaevm.c > > index 43eb4ef2412c..d2194a6ca0f8 100644 > > --- a/src/libimaevm.c > > +++ b/src/libimaevm.c > > @@ -402,13 +402,26 @@ static struct public_key_entry *public_keys = NULL; > > > > static EVP_PKEY *find_keyid(uint32_t keyid) > > { > > - struct public_key_entry *entry; > > + struct public_key_entry *entry, *tail = public_keys; > > If user specified in `-k` filename that does not exist no key is added > into public_keys and it remains NULL. Right, just the keyid is added and an error message is emitted. > > > + int i = 1; > > > > for (entry = public_keys; entry != NULL; entry = entry->next) { > > if (entry->keyid == keyid) > > return entry->key; > > + i++; > > + tail = entry; > > } > > - return NULL; > > + > > + /* add unknown keys to list */ > > + entry = calloc(1, sizeof(struct public_key_entry)); > > + if (!entry) { > > + perror("calloc"); > > + return 0; > > + } > > + entry->keyid = keyid; > > + tail->next = entry; > > In that case here is SIGSEGV when user try to ima_verify. find_keyid() returns NULL, which is checked before being used.  There's only one caller of this function. Do you have a test case to reproduce this bug? Mimi > > > + log_err("key %d: %x unknown\n", i, __be32_to_cpup(&keyid)); > > + return 0; > > } > > > > void init_public_keys(const char *keyfiles) > > @@ -470,8 +483,8 @@ static int verify_hash_v2(const char *file, const unsigned char *hash, int size, > > > > pkey = find_keyid(keyid); > > if (!pkey) { > > - log_err("%s: unknown keyid: %x\n", > > - file, __be32_to_cpup(&keyid)); > > + log_info("%s: unknown keyid: %x\n", > > + file, __be32_to_cpup(&keyid)); > > return -1; > > } > > >