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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E848C4829D for ; Mon, 12 Feb 2024 22:03:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AE5836B00BB; Mon, 12 Feb 2024 17:03:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A96046B00BC; Mon, 12 Feb 2024 17:03:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9360D6B00BD; Mon, 12 Feb 2024 17:03:48 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 7E6766B00BB for ; Mon, 12 Feb 2024 17:03:48 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 468FAA05A3 for ; Mon, 12 Feb 2024 22:03:48 +0000 (UTC) X-FDA: 81784529736.11.4C9EB51 Received: from mail-oo1-f41.google.com (mail-oo1-f41.google.com [209.85.161.41]) by imf19.hostedemail.com (Postfix) with ESMTP id 8AD621A0024 for ; Mon, 12 Feb 2024 22:03:45 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=CGJOQw48; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.161.41 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1707775425; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=93VuehxW8IiZjqg3cy8gX+Dj6JAjR6qHpJt8+OJ38pE=; b=3KX0kcU0egxuRmsaanCTSxyvK2/XVdj0Yv0lqIXRP566EOIDIrNtKcLogkIoaXW94kq0P4 1WHCnyWiO7prpWPS5ETjHn8wrZ/55ifWAt0o5SfWM7ZY5xmzlqT3jspp9Bmwi3mNs6/f1p Q2UkXiPZJcTaqNdRjv426GIPofsDzqE= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=CGJOQw48; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.161.41 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707775425; a=rsa-sha256; cv=none; b=oYkRP70WHV8cEYpxx6Sx9Ui2o0ds4IWP9MlLdblhwnsA0IKm5TS+mQzGKdLu6hBnaGVOSN Q8ht8X+HVLujtSppDEjSIf1rwqDPPlJwBgxx2+NqPt+V0leLGk6Dz/UxxZuTiEuVGhEoPU 2wZze2/sGuIbbWuCuxn8jIhccEwDpow= Received: by mail-oo1-f41.google.com with SMTP id 006d021491bc7-59927972125so206601eaf.3 for ; Mon, 12 Feb 2024 14:03:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707775424; x=1708380224; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:from:to:cc:subject:date:message-id:reply-to; bh=93VuehxW8IiZjqg3cy8gX+Dj6JAjR6qHpJt8+OJ38pE=; b=CGJOQw48Vl937PJuCWp5go+q7lAq/50DtoTwaXv4ufCC3uRF+aM9sY1V6eef35dwjv h9mT3BQv1xx9IWury26RqQXqq7G9+HU5kbcUmm63A9ZL5SA3lq+v+A2ifu9ECKGdjLAz TwRajBPOYvHHzaMSFnyz2dmU63xslgx84bvuvPLP/eJH3hcCIkf0JkXId60a+Q3rpPJT M1H4zvvHzly+ugMqw7q0wDxdtO2VjdjpIZa8j5yBsukpjdq0p777J+cIa9UZ4L6FuuVn C3aXVgVBL3mC82Q4Rz7KlSiXAluB+3Ow6WgMrs1Eg9FOsQ+ZLwQUbnVz0cnnbSK5q3XO EThQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707775424; x=1708380224; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:date:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=93VuehxW8IiZjqg3cy8gX+Dj6JAjR6qHpJt8+OJ38pE=; b=wR8ld7UYdxyLjkE1+F2izWNugp3Nvt/ZwZcPeyO7epC1F3mab6H1lZtn4lFEO3ZVYy /dXG3oeAkjgzgtE2Ht11YKsEG0DKDq5fdLQJCznL/Wypsh98WTgGyNPcF/v1o+m1Uy4I EDJiGMUM7wErXmU3qhPiMWWAJTDfGAdBihRmsEttGORGjY/WPCUCF39WqPI3gw05F7N9 2F+jiJ1xDsPRFvIPMttmMtikxMI06nMt2a2vlMPpt2cYc+TAkPR/LfICqzLHZElmRxyP 9ZOvEZ0sRjSMxfKNa+nqdIetW7YOLRbt9M2iJvus6HjpaoOTHfcjcsb4u6Cb9wJjbB7h YAjg== X-Forwarded-Encrypted: i=1; AJvYcCU1SPziVpbw8aIfMavM0yZ4M1xvkA9QxlA4phBhJ26b0ehV7iz24ZbCEO/2At99UNYTlDTTTMPmWfJvSXPJX9l4Ytk= X-Gm-Message-State: AOJu0YykkmbjHIwFQPX4exhkcjY9QzbiVXTay5iqWamEX/dd3vUNaDtc J2P7Jx9FCZXUX49vnewCRlZn68q2O+aHROkiGJWgSuARMC0oNqWs X-Google-Smtp-Source: AGHT+IE5OBKx1zbmYznUgitfUIrZdUAxmS+Eas2NAO7RGcO4j6U6ISP+C6U15Hc5IQBn0IfaRdlLPw== X-Received: by 2002:a05:6358:d093:b0:178:67dc:aba8 with SMTP id jc19-20020a056358d09300b0017867dcaba8mr9820912rwb.17.1707775424575; Mon, 12 Feb 2024 14:03:44 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXsq3wUY11a+L7NuGj3BsmexGP6eZMiamdWyBsuJhiWpvO+ZarhxYNh9jN84eNMeJYhoOciFuWzz1ZnHmXsGB1m36yXHC0X6Bvd9KjpNp2fx7VJj0MQPEsh3nsPhRZtad4FDyh1OEF5Sl6qvAdFW4vKJm4/bHT+gbZ3oTrxYFPUKWoaXCU5A2ztB/oOmEw9ipe0214tr1qPrrqu1jsbviotxTqCJoI+OwAKtjNxF//RL0E6DEsDwDfSwF9RXH5EZkhrN3NnBKB8JaxLEB15EJZ4s9CN4fU7ebDUQxUsrv6wIn9BfRO+1c8jZ6oAvubgeK4EOyp07xU2RteUIcVjpr9wRJuXYhpDE83B7le4oDDm3DgtWGzYJcRDGoGD0kcBYSLEQL/C5dNkiJq8bdSCq4mRA3hixJM8UqLw8YsrXx6+qTzJ5QU+i6xDEbeZdz19lsh1rjhdIC0ch55qG4OdAFBwJ3zbYmTinLp2J+1HCDD0D7jt4v3+XiYQwrtu5r7UxNtDUNdE/xZbr6vFtQozelocRvVVtl3CUicsCQ6IAHDrEAdS49M9HFhDKZm+OLaHLGH6GA5d6ktp7067c5t1JpQ8JNUR Received: from debian ([2601:641:300:14de:7353:5102:82c6:956f]) by smtp.gmail.com with ESMTPSA id x23-20020aa79197000000b006e05c801748sm5994884pfa.199.2024.02.12.14.03.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 14:03:44 -0800 (PST) From: fan X-Google-Original-From: fan Date: Mon, 12 Feb 2024 14:03:24 -0800 To: Mathieu Desnoyers Cc: Dan Williams , Alasdair Kergon , Mike Snitzer , Mikulas Patocka , Andrew Morton , Linus Torvalds , Vishal Verma , Dave Jiang , Matthew Wilcox , Arnd Bergmann , Russell King , linux-arch@vger.kernel.org, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-xfs@vger.kernel.org, dm-devel@lists.linux.dev, nvdimm@lists.linux.dev Subject: Re: [PATCH] nvdimm/pmem: Fix leak on dax_add_host() failure Message-ID: References: <20240212162722.19080-1-mathieu.desnoyers@efficios.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240212162722.19080-1-mathieu.desnoyers@efficios.com> X-Rspam-User: X-Stat-Signature: g7ed4z5ik4yng4rwf8ftdkrj15zpocyk X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 8AD621A0024 X-HE-Tag: 1707775425-6725 X-HE-Meta: U2FsdGVkX1/TGtnKX1p2cDMl3pqiYtGtKUcntGQfQg+GiNI3tNhMg7x6EVj3F/KYQA5VQluXUgPI4yDoNyjCZehL6l7We2vQZwhqXWvWYSkJd3hThs8HEUb8S71ygPmHsFGBE0+yaU7XcN1RMNKjicTqw/8s9OxJb3rlOxwhznVMQx20QVwz4/9P2cBGQyJ+jodg3uZpDUmunr2uUVCnI4CMoGqeo9eREJrFXLxcQsVWAxoqgOdPua49zsaNuQyq72G68dZfF9nApmMGKRbbRu5o8Xl9OdRFkP8yUXuaPca9XTRV9Zu1zZH76R+andNV1bcqelgRtZsZbDj9QXGYy/C+XYcnqVBdRGAkNfVR634ThN+Z5HenzYc8smoRx2HurDmu+ZDRuWaM7f61DcbzlN5XiP9VjVyo6sztUWBdtmCL+ujrPhv2vAI5zwH6txaVSB4AwUgZGZzECKEVxFymGDohBRs2iZzQtO+u3B8gEotfKNgMdX7Ah+zFDwcewCelMWc2pQwtU0HoWZYKsYyz0dlKGfsM9quv69FCnsxoJafwclXvuk+LYCBCJCLiRIDC3SloWGFeSnVtSypgI8TQ4zzps7JLfOxK1s7dYV5rY3G2Lydm3itwHuc2kHHErSWWbypeOT1F3lORvndv3fSqI52+yhAdG+ZkwZFCieW9zzVUslBtWAeim8AnPtUQPhB5fyHzRmSBIsXz8T0ig0BJFROBV0S9xNj7xX/zBZmX7WPxxUXo5/WAEHJBJ6yw4xsApvOFwei6wJ3RfGVNe9ZNn6Vpu6Euf/1Ba7g1UcXYDRvbZrbKRG/RzlSl9M3PFlijuaFAHbe1yGdAUYYS4tArjj9cA/tmNMmAHo1TGG8S8HkVVqZ0y/09xgYBFSySXmyMyl/+OsPRM4j8i2E37Aecg9o9x9rTqCdNPcvRwF9IxCzB31pTOTHbTR7dGTENgmgES30JSnEtU8DM11PKZwE zRyVoenz bzyN6zm0o8Xs5VrV6TrlQrD8YRKNyfRfEzmicPW3tjxA8nHmveidD/Oh65GTd82KsC2CEn8fI/CCtvWhlZbmfWJXLVnjoZ/e3QXvRdl65n3s8uc48z3QVus9H/y4Wnyr7SVksIbSB0DPk3s13TdFteDve2A== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Mon, Feb 12, 2024 at 11:27:22AM -0500, Mathieu Desnoyers wrote: > Fix a leak on dax_add_host() error, where "goto out_cleanup_dax" is done > before setting pmem->dax_dev, which therefore issues the two following > calls on NULL pointers: > > out_cleanup_dax: > kill_dax(pmem->dax_dev); > put_dax(pmem->dax_dev); > > Signed-off-by: Mathieu Desnoyers > Reviewed-by: Dan Williams > Cc: Alasdair Kergon > Cc: Mike Snitzer > Cc: Mikulas Patocka > Cc: Andrew Morton > Cc: Linus Torvalds > Cc: Dan Williams > Cc: Vishal Verma > Cc: Dave Jiang > Cc: Matthew Wilcox > Cc: Arnd Bergmann > Cc: Russell King > Cc: linux-arch@vger.kernel.org > Cc: linux-cxl@vger.kernel.org > Cc: linux-fsdevel@vger.kernel.org > Cc: linux-mm@kvack.org > Cc: linux-xfs@vger.kernel.org > Cc: dm-devel@lists.linux.dev > Cc: nvdimm@lists.linux.dev Reviewed-by: Fan Ni > --- > drivers/nvdimm/pmem.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c > index 4e8fdcb3f1c8..9fe358090720 100644 > --- a/drivers/nvdimm/pmem.c > +++ b/drivers/nvdimm/pmem.c > @@ -566,12 +566,11 @@ static int pmem_attach_disk(struct device *dev, > set_dax_nomc(dax_dev); > if (is_nvdimm_sync(nd_region)) > set_dax_synchronous(dax_dev); > + pmem->dax_dev = dax_dev; > rc = dax_add_host(dax_dev, disk); > if (rc) > goto out_cleanup_dax; > dax_write_cache(dax_dev, nvdimm_has_cache(nd_region)); > - pmem->dax_dev = dax_dev; > - > rc = device_add_disk(dev, disk, pmem_attribute_groups); > if (rc) > goto out_remove_host; > -- > 2.39.2 >