From patchwork Thu Sep 16 15:56:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 512995 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp1375806jao; Thu, 16 Sep 2021 09:30:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfOUe3xhSr4R2wKBPcp0dlVdzfx6Zr7nFVzPF1R4jNn8Jf+2qqk7ZdmUZTklj0DHDnRe1g X-Received: by 2002:a17:906:9882:: with SMTP id zc2mr7131617ejb.41.1631809851783; Thu, 16 Sep 2021 09:30:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631809851; cv=none; d=google.com; s=arc-20160816; b=TUC0C8al7BFdlshaeeom8MoUrxw8tApVK7L/kl0svnpSOePupheC5Q3G4nAUw/3G5n +LpYTNmH0+6ZGSmorIjScCaryHSiyQP1ua0qTFdEnemQBSHal+eLrMsihjp0QQhNcQBb Xm8lc3GLk9VnSQoEh2TN/di+o0OZc4kMKBgO/Z+Vt7JcYVer7325Tn6u7235hcrcmDlv hMwGFMXL0pA7XWr8MqjFzJL7zrgmfD3Sgt6vrcAshhbyXHjnZx9BRXGSs31hu9rmO9R3 w+CUqN7EJc7yFl3AJFQyz05JOoWC97WowemteMHIuXMQrA3lV73v/Ur2xck2Tp3zP4l2 t3Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zzeCKUj3wizJA9Y4CZQG6sWe4V18D5dTkIxrvAltqew=; b=X0zyowgh1CbIbDBD1nKt6YvcnkjllWElfBgWS+PFkbVUXtwjl74d6scHq98sMfvZiw xDX446214sK4LqgvoAzbpIIR6PxS/7zvdNhnMKrwBuxK5AhzavRE7BdUshdlOx8SuV4P wgfYKI/du8ZoYAHyb3sgKlyL1osY6799x3NM13prhzL8RJuxPsTR2ZtBfeuV+6EtXs1n 5bndS8HuwR1PIq7F3aSf5O7qmIl/ZUvg3rkgjLl5Mon9/GRv9qyW22ZKGnFqzSCKrI6W V0k+STPl+ONZgV6HolUq6FBTpalS/kWz717tKVEov42+dD5Q41VqLdVFVOsUe1ka3JHS +8fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sCTdgO2O; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j6si4255101ejj.365.2021.09.16.09.30.51; Thu, 16 Sep 2021 09:30:51 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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=@linuxfoundation.org header.s=korg header.b=sCTdgO2O; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242103AbhIPQcG (ORCPT + 11 others); Thu, 16 Sep 2021 12:32:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:38936 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243182AbhIPQaJ (ORCPT ); Thu, 16 Sep 2021 12:30:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5785661381; Thu, 16 Sep 2021 16:19:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631809140; bh=mYdBCRdVHdijlfqercYxcBGop3pGY/1ztuhYi1yJIDA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sCTdgO2OktbzRtF1iEGcUeuy1ZOWg31nU61y1WzmyxxWkZPwtkdKTDP5ZXhUVDT32 T81r21ClqLzepRSZiyC8aDiXcljcfg//ydvKHO8yLGffqhs8WbwgNt8zU4XGrZJNTa a49BpXnFi69DyXRlcRwKNX256J0CAVvgWVLB0gzs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH 5.13 046/380] nvmem: core: fix error handling while validating keepout regions Date: Thu, 16 Sep 2021 17:56:43 +0200 Message-Id: <20210916155805.547040114@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155803.966362085@linuxfoundation.org> References: <20210916155803.966362085@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Srinivas Kandagatla commit de0534df93474f268486c486ea7e01b44a478026 upstream. Current error path on failure of validating keepout regions is calling put_device, eventhough the device is not even registered at that point. Fix this by adding proper error handling of freeing ida and nvmem. Fixes: fd3bb8f54a88 ("nvmem: core: Add support for keepout regions") Cc: Signed-off-by: Srinivas Kandagatla Link: https://lore.kernel.org/r/20210806085947.22682-5-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- drivers/nvmem/core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -818,8 +818,11 @@ struct nvmem_device *nvmem_register(cons if (nvmem->nkeepout) { rval = nvmem_validate_keepouts(nvmem); - if (rval) - goto err_put_device; + if (rval) { + ida_free(&nvmem_ida, nvmem->id); + kfree(nvmem); + return ERR_PTR(rval); + } } dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name);