From patchwork Tue Dec 12 09:20:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 177194 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp7602996vqy; Tue, 12 Dec 2023 01:21:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IHnyapFn8BU5dTYYmfdb52I4rs9CcV6FN7xQzmvNoXiRxUbmCVEGmE+Rjwezgo/+eMXGWyN X-Received: by 2002:a05:6e02:148d:b0:35d:5782:222 with SMTP id n13-20020a056e02148d00b0035d57820222mr9283724ilk.31.1702372864490; Tue, 12 Dec 2023 01:21:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702372864; cv=none; d=google.com; s=arc-20160816; b=ebr4ErGxs71LxDY9hgf9lxZO9ytoqjRt7hClS6l9lzWnHbeU64vVir/pHA4zN9zFQx 37y9NmIdtwE6OM+TwfhOWgV3aB3VDCs+LRHfnvbekfjji6XD13u/rt6KR39FlAej6MoI mbwRYvbiywroxYHIsnI12vCuqPGkD+eKYxTP1dlQhsy13afM2VGjMy50guzOUkImoj6F 2e9Bqych7ddxB7oRqmd/NuqMD4S0gNrzUdSBmH3S9kJkCtIAL0N6rkwY7Q6GWWNRc4QO 5e1qfuKFD64HShukwFfWVMaXOy4rPsQYxP9gFZtd+uM9nd6V420YcH+k7ZRYAgIZYjBP ovSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=q7/FCALzJMBC/rKEcJ3A2AOybQwAx21cZLAPfuxjI6U=; fh=QgsB2KXrYN0XShAyGOnbg0ad15Zn1fYjo+YJLEzti6M=; b=RDM9lJp3DzrG0oTQDxZvNx2ks+7VaNFmk5hvIlGfdRjMy3CrfsOG5oULv4AtSi7OmT IzJkM71sFjqAX5UBsNDMGuZnW8HCmZV4h2MbR7BlogzmVTTfZ0p1ymJcMSL6T0FjoYBr fGwGiaEv9xDfgqgG20h6KwV7NRk10jNIZy1B2MnU3jUgs0OJWsJwULSxSnPyYkKKhtRR T2UIxMcWvKGXx74gr1rBJppUxOOpJv4ZKoehh2JWlm8mVz4Pm7glAIfKDpoxbV2yd2be b0CPoUyo4h63AB/6PxLp9rV/0Vzvz/qLHDf6nw3soxyqX3ERe6T5fkDLMq+GLPJIkNyo YIQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bcXT1ZyN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id q16-20020a656850000000b005c671034479si7348076pgt.490.2023.12.12.01.21.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Dec 2023 01:21:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bcXT1ZyN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 3B40D80A4308; Tue, 12 Dec 2023 01:20:58 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346330AbjLLJUg (ORCPT + 99 others); Tue, 12 Dec 2023 04:20:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346351AbjLLJU1 (ORCPT ); Tue, 12 Dec 2023 04:20:27 -0500 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D32711A for ; Tue, 12 Dec 2023 01:20:33 -0800 (PST) Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-54cd2281ccbso7194390a12.2 for ; Tue, 12 Dec 2023 01:20:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702372832; x=1702977632; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=q7/FCALzJMBC/rKEcJ3A2AOybQwAx21cZLAPfuxjI6U=; b=bcXT1ZyNsRHuSJ/Z5ybzzkK1GK1fqAjvw9qONP+OvUhUH2rWkmQ1vAHFHqgMj8B4N6 Dfl3yeNt9QoqEgQggg5XVhGx0GiCk4rRY/3t8T9NnKuYsYZ84M0ex8YBt5DbFr2bzCbr udqXVy/Dw3YRz3qwL48ZddBBR5mAqx/cipZ0tFcqmyiSi8gD8dqwYw0SswBGKZfE9Mak KqOzj6zXOpwMz/UKt1Js9r72/NEf5C/MJU6E6G2UmLw9W/wQsJEoueDNU1VawueeYs8v S0ZGo02hwtOGpvR2VY71W0hwjEcD9nqHT6uAbdHc4s09NmlwYu1U8V424mDNSgm900JT n1WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702372832; x=1702977632; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=q7/FCALzJMBC/rKEcJ3A2AOybQwAx21cZLAPfuxjI6U=; b=nhtu3dRR1J3z5l4l7UaxuLfcPzOvVxTSCRrWs+h/4VakoZhlGfPq9XS0KNp7kFf7ei ufF8hZOAZrAyWd8AAxpJAMbmHzSxosUspQxOajaI5M6PTZykd/HOD8IhjH9Pb5QfzUO4 asQmyNlq+zCMNCwXd3YBxjvyB/KfoH45kPxWHVGCxmt8xWaou/RP+XT4ig5RZNQhuKp0 4Gn6hNl/kUCicvGQjzznVta53WDNwjdZdShjV4e6fK5ne6E5ZH0qS5ti+OfNGcXQ0iBc 8sM8hDDMl9pI9GAJpAGbBmmRTpSGZQ//WXeL4i03TIdwg4yggQOi08y1ZcBzASYPkT4O 1RQg== X-Gm-Message-State: AOJu0YzHlsJv3Ckf5wbl/LCfqmx8uAOMkerNmuqzNUaNsAO3KyizuicF q+brWh92X5YzqiPEfmb3U/U0Hg== X-Received: by 2002:a50:85ca:0:b0:551:14c0:7325 with SMTP id q10-20020a5085ca000000b0055114c07325mr1998415edh.40.1702372831751; Tue, 12 Dec 2023 01:20:31 -0800 (PST) Received: from localhost (h3220.n1.ips.mtn.co.ug. [41.210.178.32]) by smtp.gmail.com with ESMTPSA id h28-20020a056402095c00b0054c21d1fda7sm4525402edz.1.2023.12.12.01.20.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Dec 2023 01:20:31 -0800 (PST) Date: Tue, 12 Dec 2023 12:20:27 +0300 From: Dan Carpenter To: Abhijit Gangurde Cc: Nipun Gupta , Nikhil Agarwal , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] cdx: Unlock on error path in rescan_store() Message-ID: <8c79956b-bf8c-4511-97cc-a16833a0630f@moroto.mountain> MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding X-Spam-Status: No, score=0.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_BL_SPAMCOP_NET,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Tue, 12 Dec 2023 01:20:58 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785067328575985552 X-GMAIL-MSGID: 1785067328575985552 We added locking to this function but these two error paths were accidentally overlooked. Fixes: f0af81683466 ("cdx: Introduce lock to protect controller ops") Signed-off-by: Dan Carpenter Acked-by: Nikhil Agarwal --- drivers/cdx/cdx.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/cdx/cdx.c b/drivers/cdx/cdx.c index d84d153078d7..f4f9f0c88c09 100644 --- a/drivers/cdx/cdx.c +++ b/drivers/cdx/cdx.c @@ -572,12 +572,16 @@ static ssize_t rescan_store(const struct bus_type *bus, /* Rescan all the devices */ for_each_compatible_node(np, NULL, compat_node_name) { - if (!np) - return -EINVAL; + if (!np) { + count = -EINVAL; + goto unlock; + } pd = of_find_device_by_node(np); - if (!pd) - return -EINVAL; + if (!pd) { + count = -EINVAL; + goto unlock; + } cdx = platform_get_drvdata(pd); if (cdx && cdx->controller_registered && cdx->ops->scan) @@ -585,7 +589,7 @@ static ssize_t rescan_store(const struct bus_type *bus, put_device(&pd->dev); } - +unlock: mutex_unlock(&cdx_controller_lock); return count;