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=-5.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 E98CBC7618F for ; Mon, 15 Jul 2019 20:05:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C73892145D for ; Mon, 15 Jul 2019 20:05:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730918AbfGOUFN (ORCPT ); Mon, 15 Jul 2019 16:05:13 -0400 Received: from vmicros1.altlinux.org ([194.107.17.57]:57674 "EHLO vmicros1.altlinux.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730872AbfGOUFN (ORCPT ); Mon, 15 Jul 2019 16:05:13 -0400 Received: from imap.altlinux.org (imap.altlinux.org [194.107.17.38]) by vmicros1.altlinux.org (Postfix) with ESMTP id 3218C72CA65; Mon, 15 Jul 2019 23:05:11 +0300 (MSK) Received: from altlinux.org (sole.flsd.net [185.75.180.6]) by imap.altlinux.org (Postfix) with ESMTPSA id 218314A4A29; Mon, 15 Jul 2019 23:05:11 +0300 (MSK) Date: Mon, 15 Jul 2019 23:05:11 +0300 From: Vitaly Chikunov To: Mimi Zohar Cc: Dmitry Kasatkin , linux-integrity@vger.kernel.org Subject: Re: [PATCH v1 2/5] ima-evm-utils: Fix possible strcpy overflow Message-ID: <20190715200510.gbebcml3uzmfdf7i@altlinux.org> Mail-Followup-To: Mimi Zohar , Dmitry Kasatkin , linux-integrity@vger.kernel.org References: <20190712212833.29280-1-vt@altlinux.org> <20190712212833.29280-2-vt@altlinux.org> <1563217735.4539.145.camel@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1563217735.4539.145.camel@linux.ibm.com> User-Agent: NeoMutt/20171215-106-ac61c7 Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org On Mon, Jul 15, 2019 at 03:08:55PM -0400, Mimi Zohar wrote: > On Sat, 2019-07-13 at 00:28 +0300, Vitaly Chikunov wrote: > > caps_str is passed from command line but copied into fixed-size buffer. > > CID 229895. > > --- > > src/evmctl.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/src/evmctl.c b/src/evmctl.c > > index 39bc3d9..e07cff4 100644 > > --- a/src/evmctl.c > > +++ b/src/evmctl.c > > @@ -409,8 +409,9 @@ static int calc_evm_hash(const char *file, unsigned char *hash) > > } else if (!strcmp(*xattrname, XATTR_NAME_CAPS) && (hmac_flags & HMAC_FLAG_CAPS_SET)) { > > if (!caps_str) > > continue; > > - strcpy(xattr_value, caps_str); > > err = strlen(caps_str); > > + assert(err < sizeof(xattr_value)); > > "calc_evm_hash" can be called while walking and labeling, or > verifying, a file system. šWe probably don't want to abruptly end it. > šMaybe emit an error message and return and error? Ok. I will also add similar checks for selinux_str and ima_str. Thanks, > > > > + strcpy(xattr_value, caps_str); > > } else { > > err = lgetxattr(file, *xattrname, xattr_value, sizeof(xattr_value)); > > if (err < 0) {