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=-23.2 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 612F0C43461 for ; Sat, 1 May 2021 00:02:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3FCA161423 for ; Sat, 1 May 2021 00:02:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232828AbhEAAD0 (ORCPT ); Fri, 30 Apr 2021 20:03:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232957AbhEAADZ (ORCPT ); Fri, 30 Apr 2021 20:03:25 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66E68C06138C for ; Fri, 30 Apr 2021 17:02:36 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id c11so8660274lfi.9 for ; Fri, 30 Apr 2021 17:02:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=KBoeQcMdIXHbrr5qlPjaHe4/MPMag2oC2aXYy4bOLac=; b=fk2hsfuYfGs/AoLeyHdX2NoIlNk1zaTNJSnZt4pQHFSjPY8+WK1Ez5pMSN7OadFDIK PQWtOfGaP0cSwvYOBouQBV07RiMzKNvCstfdLwcPGUP9NlCAGsoxZcfkbkj0YM1QHsT4 l/SLhvHV+mO9i7xpOl0NZJ2mHSkzDYhP9qiK2LIwM+mAC/ZUUDTGbralv7SUh0lgEb4E WAEPMUk4VLx1EgNA5K8LgO+MqjjiBGrM8ssKRV0BzLgPAyvJgJqAgqHHzcFY1c/hzG/B yo3KM2oDiGv0jAJYXGmIsm9fgrrruGghiwRacICmGk5Gu3SSd1POZcKwuO+NFW0fAQqX TiIg== 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:cc; bh=KBoeQcMdIXHbrr5qlPjaHe4/MPMag2oC2aXYy4bOLac=; b=qT0AoTsHrifWc9CVpIDjl90R+HcHjnAQoZWFrW4nIjPLm8Jl06I/B6EaUclzZeYQc8 BeRoEEj7KnnjcpRWoHfoT5vrfWKuDlwAFANwqCsIZ1MMEHzX/Td3ZbpkUxVVv1EjeYwy b072gyC5pt8PWJRo2+/GuR0MEelnjeuJBgjUaBoDtAxxLwDYXdGKBDxqUeS0+yI/BxYE 82dy5WDyCkK4wLB/+hZ/J02Nduy3+sIJXY3SQSpFumiMzXUcv7zOk5EEciOpjtpfeeB2 kQ0AMkJ36NNQ1OhsMEa+UaKCjtRPD4AtD0+X5LpeW27lG410MqM63wsEaDs1JHusQYW0 P5qg== X-Gm-Message-State: AOAM531hkoCmaq7itITjEAoG1ilR1q/QE2o8d+CL8BuQgHmqFmYBKH6S 0zns9HOv3ybaPKm/7gC2+9Eh5uc1+YoQ7R/j5OZmeQ== X-Google-Smtp-Source: ABdhPJyeDYxpSSUN00ffOc9Ev/oEZsLPNT6O5Ku56l9FwpBGbOHdogzMKnpaHlpw9hwA/PJ9RkDVNEjOFLQTUl8qHbE= X-Received: by 2002:a05:6512:2190:: with SMTP id b16mr4995671lft.122.1619827354571; Fri, 30 Apr 2021 17:02:34 -0700 (PDT) MIME-Version: 1.0 References: <20210430113724.110746-1-colin.king@canonical.com> In-Reply-To: <20210430113724.110746-1-colin.king@canonical.com> From: Nick Desaulniers Date: Fri, 30 Apr 2021 17:02:23 -0700 Message-ID: Subject: Re: [PATCH] KEYS: trusted: Fix memory leak on object td To: Colin King Cc: James Bottomley , Jarkko Sakkinen , Mimi Zohar , David Howells , James Morris , "Serge E . Hallyn" , Nathan Chancellor , linux-integrity@vger.kernel.org, keyrings@vger.kernel.org, linux-security-module@vger.kernel.org, LKML , kernel-janitors@vger.kernel.org, clang-built-linux Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: keyrings@vger.kernel.org On Fri, Apr 30, 2021 at 4:37 AM Colin King wrote: > > From: Colin Ian King > > Two error return paths are neglecting to free allocated object td, > causing a memory leak. Fix this by returning via the error return > path that securely kfree's td. > > Fixes clang scan-build warning: > security/keys/trusted-keys/trusted_tpm1.c:496:10: warning: Potential > memory leak [unix.Malloc] > > Fixes: 5df16caada3f ("KEYS: trusted: Fix incorrect handling of tpm_get_random()") > Signed-off-by: Colin Ian King Thanks for the patch! Reviewed-by: Nick Desaulniers > --- > security/keys/trusted-keys/trusted_tpm1.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/security/keys/trusted-keys/trusted_tpm1.c b/security/keys/trusted-keys/trusted_tpm1.c > index 469394550801..aa108bea6739 100644 > --- a/security/keys/trusted-keys/trusted_tpm1.c > +++ b/security/keys/trusted-keys/trusted_tpm1.c > @@ -493,10 +493,12 @@ static int tpm_seal(struct tpm_buf *tb, uint16_t keytype, > > ret = tpm_get_random(chip, td->nonceodd, TPM_NONCE_SIZE); > if (ret < 0) > - return ret; > + goto out; > > - if (ret != TPM_NONCE_SIZE) > - return -EIO; > + if (ret != TPM_NONCE_SIZE) { > + ret = -EIO; > + goto out; > + } > > ordinal = htonl(TPM_ORD_SEAL); > datsize = htonl(datalen); > -- > 2.30.2 > -- Thanks, ~Nick Desaulniers