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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C43D0C4332F for ; Fri, 16 Dec 2022 08:36:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229734AbiLPIg0 (ORCPT ); Fri, 16 Dec 2022 03:36:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229705AbiLPIgW (ORCPT ); Fri, 16 Dec 2022 03:36:22 -0500 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E0CE36C67; Fri, 16 Dec 2022 00:36:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671179782; x=1702715782; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=x4KOJKV9zJa7Q5/qcA2VHSVtGXnaPAHP82to8WMzGIg=; b=ktB9kE3c20QSmMrnWKaz4EwRDWcO2XJwSO0p8RSR2w3VefLAiY8IkcfQ XGtF+AzoxiCjbeBTfWxdEBzJy7/37EfMB8keOtOpPFM6EQOFf6Vdg6/bG EKXqQRMrXCT3eGCA/gKjh1OsiPCrYf4ENe5GyH7Hj6jn7P+BotB2h7Xg8 1V2ZRY6lUy7vw6D6OPx8mDtDLwv91JEQ53bLz0kxgYsGfG3Te0d+C8yqk gsnPGgD0c/0d0Vkar8N5EU8Y4J5jMnHicenjdq/wqr2qHnKNxOLQzHoOL X4kocFeMtWOb2HN1WJsrvuZsKHPuTicyaEoU8Bhq+bJ81dJboivGlCq/p Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10562"; a="298588968" X-IronPort-AV: E=Sophos;i="5.96,249,1665471600"; d="scan'208";a="298588968" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Dec 2022 00:36:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10562"; a="738465028" X-IronPort-AV: E=Sophos;i="5.96,249,1665471600"; d="scan'208";a="738465028" Received: from yilunxu-optiplex-7050.sh.intel.com (HELO localhost) ([10.239.159.165]) by FMSMGA003.fm.intel.com with ESMTP; 16 Dec 2022 00:36:19 -0800 Date: Fri, 16 Dec 2022 16:26:25 +0800 From: Xu Yilun To: Ilpo =?iso-8859-1?Q?J=E4rvinen?= Cc: Russ Weight , Moritz Fischer , Wu Hao , Tom Rix , linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org, Matthew Gerlach , Marco Pagani Subject: Re: [PATCH v2 1/1] fpga: m10bmc-sec: Fix probe rollback Message-ID: References: <20221214144952.8392-1-ilpo.jarvinen@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20221214144952.8392-1-ilpo.jarvinen@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2022-12-14 at 16:49:52 +0200, Ilpo Järvinen wrote: > Handle probe error rollbacks properly to avoid leaks. > > Fixes: 5cd339b370e2 ("fpga: m10bmc-sec: add max10 secure update functions") > Reviewed-by: Matthew Gerlach > Reviewed-by: Russ Weight > Reviewed-by: Marco Pagani > Signed-off-by: Ilpo Järvinen > --- > I don't know if the previous one fell through cracks so resending this. I'll pick this when v6.2-rc1 comes. Acked-by: Xu Yilun > > v2: > - Resending v1 with Marco's Rev-by > > drivers/fpga/intel-m10-bmc-sec-update.c | 17 ++++++++++++----- > 1 file changed, 12 insertions(+), 5 deletions(-) > > diff --git a/drivers/fpga/intel-m10-bmc-sec-update.c b/drivers/fpga/intel-m10-bmc-sec-update.c > index 79d48852825e..03f1bd81c434 100644 > --- a/drivers/fpga/intel-m10-bmc-sec-update.c > +++ b/drivers/fpga/intel-m10-bmc-sec-update.c > @@ -574,20 +574,27 @@ static int m10bmc_sec_probe(struct platform_device *pdev) > len = scnprintf(buf, SEC_UPDATE_LEN_MAX, "secure-update%d", > sec->fw_name_id); > sec->fw_name = kmemdup_nul(buf, len, GFP_KERNEL); > - if (!sec->fw_name) > - return -ENOMEM; > + if (!sec->fw_name) { > + ret = -ENOMEM; > + goto fw_name_fail; > + } > > fwl = firmware_upload_register(THIS_MODULE, sec->dev, sec->fw_name, > &m10bmc_ops, sec); > if (IS_ERR(fwl)) { > dev_err(sec->dev, "Firmware Upload driver failed to start\n"); > - kfree(sec->fw_name); > - xa_erase(&fw_upload_xa, sec->fw_name_id); > - return PTR_ERR(fwl); > + ret = PTR_ERR(fwl); > + goto fw_uploader_fail; > } > > sec->fwl = fwl; > return 0; > + > +fw_uploader_fail: > + kfree(sec->fw_name); > +fw_name_fail: > + xa_erase(&fw_upload_xa, sec->fw_name_id); > + return ret; > } > > static int m10bmc_sec_remove(struct platform_device *pdev) > -- > 2.30.2 >