Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp542422pxf; Wed, 7 Apr 2021 06:05:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyGyoHVYg/3EHkVv7vfvOmrcIpAEM6vnorhREhcXg4UOkJGG3htGui/51/ykyvhUgwNH0X+ X-Received: by 2002:a17:906:a0d4:: with SMTP id bh20mr3616460ejb.348.1617800710499; Wed, 07 Apr 2021 06:05:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617800710; cv=none; d=google.com; s=arc-20160816; b=lN/kI2SE7tBaTfMtn6hCr8GTea6QAPrqwfl3KOYeuIeHTDQujKtZBWg6QEmSfvQ7BD 1NmecoR9u/fBPbOZWZ7ok++QgkdbrF2nq7CpAwXFEAetu0lkGtgVRXZC8u8TCy+jbZfK atzf53+rUgWY90s/UtX07/irVbNMeKjn+H+DSpFnV4DaOO0Cs86XgboAGKA2vWewD4Ej 0eDWiOD8uMyaD5xbHsXUMYjIogdPKbXBnI0af/eZqLqXVqQIRDtY4li3IxMW4Wh7pgZb InmpkMEHf8ct08GXnTJjB6yV4b75+QPOGazCxGy8QYpGY1QJdexcKJxQ56zeIKSKAfww RtFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:reply-to:dkim-signature; bh=9unnZdwnJBhmIr85WtW6opdl6PIonHCZIupIJTvjWiM=; b=kXbd05pyhvid/d8T0qbKym3lithp10brru+VxHQLuvUzJWaCRSbl+c2exQ/P1M1hXG 1G8ImgYel0dXI82v9esieTqoLN60MD4iPfKRQEUMLNkN1sHwyhoQTZnNpLml0JABDMzY D63J1O3JvJ9eNfCNt4A7CCieA0DntDizzJQ5QidGUqMnPtqL9gUvn6gY+RsmstUGp62h ggxr2PNhsm7qXugok40YFCHc2QN4R5edb73NzZLsX+1n34iVqMnBYqj12Tf5cywrQxrP XqbYzMR/PVaKegVTQveu0w0tDBhOk9DFevtuvu8tvkScbLzj6TqsYVwSwxBO0atxbgdB biMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=TkbGpsap; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b9si102741ejg.497.2021.04.07.06.04.41; Wed, 07 Apr 2021 06:05:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=TkbGpsap; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344204AbhDFWuS (ORCPT + 99 others); Tue, 6 Apr 2021 18:50:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344191AbhDFWuQ (ORCPT ); Tue, 6 Apr 2021 18:50:16 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D41CC06174A for ; Tue, 6 Apr 2021 15:50:08 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id q14so6671868ybk.22 for ; Tue, 06 Apr 2021 15:50:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=9unnZdwnJBhmIr85WtW6opdl6PIonHCZIupIJTvjWiM=; b=TkbGpsapVhMM/9vNTvKB2L0fGV6FDhcQqCVGeETLXWxcwfezHG91/Q32wDXz4NNQzM nc0exNLd9sY6ryGmhhmyHB1RRJGT8Chj3tHZWlz8EP2ltZ2XznhwfwqVrVa8wOWGyxx7 0q80IQ90Nro8z6l81DX7mZp32wgeHg/9fnbOVCWSN+TnbJo+T+psv21FIznZvp11IQSD 7OO9fnXsMk0l7y7GljMe9yy4UhNrmsgXxl6Vnzk+LjeuD/C1qm4zOXUElsRpln+otQI5 b1CaykelVe2JuM1a88H8nPQECvnwDlaUMgwiRCR90/JGzBaByfMcJAkkJv8tWLv1lKzC aw8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=9unnZdwnJBhmIr85WtW6opdl6PIonHCZIupIJTvjWiM=; b=ECZPQYFLzUbyOh5xtUU3VwhNd4bdmj5hUUbe4PtyT57I0qRtEKmWHZKCnrQyO0f39v uq8Cw3Gq8PjbubXifX63I43W9FA2bWXJPN4qDjicv0rVcyV5+v3dHfe7aC+7nn0IWqyY KpVX36hNJvAahvYHU9m8NzPDBzabklJ5tjdlOaW3iMXm8j+BWkkI91tgNeZh7F+6xuOf YfbO9E4v5lIHB63gT0dzAQPAsDDNBLUo95jyYe/77Zm3Q5kcLbZBzrxy0sofU8llf3eS RNq90QqXpP/xypA+Ws6o7zgTypMbUID+ChZhEAMmU6UmOx+ryY8vCA93AmMVU/ET57fs rVcw== X-Gm-Message-State: AOAM531aK8i7rGWYOBzPj9J53etKSbKtnXWdTDKAW523qsh0FhViDFK4 53/ZKQSnO0poubNfmS1uDPX4aq6acJU= X-Received: from seanjc798194.pdx.corp.google.com ([2620:15c:f:10:24a1:90fb:182b:777c]) (user=seanjc job=sendgmr) by 2002:a25:b3c1:: with SMTP id x1mr517791ybf.506.1617749407346; Tue, 06 Apr 2021 15:50:07 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 6 Apr 2021 15:49:45 -0700 In-Reply-To: <20210406224952.4177376-1-seanjc@google.com> Message-Id: <20210406224952.4177376-2-seanjc@google.com> Mime-Version: 1.0 References: <20210406224952.4177376-1-seanjc@google.com> X-Mailer: git-send-email 2.31.0.208.g409f899ff0-goog Subject: [PATCH v2 1/8] crypto: ccp: Free SEV device if SEV init fails From: Sean Christopherson To: Paolo Bonzini , Brijesh Singh , Tom Lendacky , John Allen Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Borislav Petkov , Christophe Leroy Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Free the SEV device if later initialization fails. The memory isn't technically leaked as it's tracked in the top-level device's devres list, but unless the top-level device is removed, the memory won't be freed and is effectively leaked. Signed-off-by: Sean Christopherson --- drivers/crypto/ccp/sev-dev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c index cb9b4c4e371e..ba240d33d26e 100644 --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -987,7 +987,7 @@ int sev_dev_init(struct psp_device *psp) if (!sev->vdata) { ret = -ENODEV; dev_err(dev, "sev: missing driver data\n"); - goto e_err; + goto e_sev; } psp_set_sev_irq_handler(psp, sev_irq_handler, sev); @@ -1002,6 +1002,8 @@ int sev_dev_init(struct psp_device *psp) e_irq: psp_clear_sev_irq_handler(psp); +e_sev: + devm_kfree(dev, sev); e_err: psp->sev_data = NULL; -- 2.31.0.208.g409f899ff0-goog