From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6638021C173 for ; Sun, 28 Jun 2026 05:05:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782623109; cv=none; b=I+cFGlpo92+wM6vKc0GnZk6Ti5ZMq2FSi8vWS1xnzIiVcfxhyEP8/O72xFHY+RymnoOW84LUYOptyA8Kujo8JGjzVqTaVlRETJXAVgNLlkvJuleHXnf+0sAfakfJuOZwB/IyT2rWyPe2F06FIbo+AhXssA89D/Gwy0w6KuJVcrI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782623109; c=relaxed/simple; bh=c2XhW/6UeH0XkCW8UnEmx/UOGPYYABfckAnJBP9UI8Y=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=tERVwUzeZ123fQVB09Im6ZtHjIknv+zdcGLZ6KSebTEgup4G5lOavsOo98Mtnb2G2k+L9quLGMOi5AZxq/EL/7aZi5j1oHpK3izz2YC/AAUMJTvAdx/z7jUp4Gp+jzu/iAiDSycrgBs+gJmhx+pP+4sDOXBQ6LWVkxJVystKGLc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=qTf5CEc2; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qTf5CEc2" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-493a285ff0cso2417555e9.2 for ; Sat, 27 Jun 2026 22:05:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782623107; x=1783227907; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=EHIrv6i22ebWzk1ZPxbscjGk0xnwAK8H0pOuIdEyCLE=; b=qTf5CEc2mdbTOpeWlfYjbXBBdMKgW7Uo+kZgm97vwFGR18/ZyEKLtc+FSJHm53ndyF CLQ5L3nux0o+m4gaEF2nj7Zl/+QtrgfFCK84AUIwsZ1dCaEm6TG/EuqTldMgQidbJvqa LZumV+0XsGmOdcgSlwn2IQHCw6HhIBl6MbIGznGZddicXXGE26sK324/Va+P2lqqh0Ns AtPXO/CWTPsZej4LdAYapf4y0lKZQX2DO5SxXld+SEjYYaB2zuNXjIkBmzk3yp3ZgNEn VhZjE3ZUL7gkB8ubRithoqBzefRkGOrafSwsPk0H6cWIGtqq18GsXpaCg67DukYd4ECH scww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782623107; x=1783227907; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=EHIrv6i22ebWzk1ZPxbscjGk0xnwAK8H0pOuIdEyCLE=; b=R96s9K9mgQmX91dkDm8n8hj1LoAH8dyovtsxqqeEPGyNjQBYO+Vc8EWPDWKrHM9nTu +kKEAphVhelEzezReTEzI86evbzCBR1WBXTjOUxvjSNIH4/FBiQNjhyv78Zd+l6ULKF0 i+91LFEUJvMAO+mcOYuKHSAZi/7UVgFy+GGomFs4NngslWEhthu1CQ19yVkvT4BEdWu3 fj6IISG0zqZNG6kFf4sDWW4EK5sjdUUt/Bmi4p6yKsalCVvo02AvHnIQn0mw2jizfe7C 5qLjDKTH1iJV31daZtHq+Z7x6FG4bnNMEP+q5ySBPklWcWwRnr70gSXA2FEDnGEAe85w edog== X-Forwarded-Encrypted: i=1; AFNElJ+P0naOkHalhNQJ5Ii7kvzEGVo/7FG5RJkBKf8uY+DGDoKnsTsNX7OTJIsIct/BxAXATBx7b6/b0Ha7ePU=@vger.kernel.org X-Gm-Message-State: AOJu0Yzw9sioTlOFUp6/vn4ljP9i2ZXa1CjWRc6i1sfZaVjslmoLObbb o2K4dSzu6rLoqyNNO4DMtn38rGlVYH/XmTlQNlrzjXefnBc8vSBlz+b7 X-Gm-Gg: AfdE7cms3Cuf/HZihlyF9AwESRcFx5fJEQfSRQxwyjBuVwkzMSjEjuLFtaBQA33Bu3W mY80lcZefHXWGHITxB91yLJrJjdBnuhS4COByECw00RaAP/sR3mZm3/cQE1nks17mDkUkG4CJmJ CS5D/yaq0giNuQ1l76piPKi1SMSylbL7SlYjr7qMZ8DO7pUrIltSXXN3tpDydGHHzO58gnRPENM bgD+kH7clNJXbOts9ZMQWMQCP0xf2scP9TzpdRm1WlM0lWO1B6K4l6tjJwPEVGaXOmwBYheKKnA 1uW6YLlOId8d6Lbd6NztvyOymdldFHOJf0uiz2WavwUHPUCmu83xgMJdIHlN7a+xOkiZMB9Uzb1 8CELrv7JP+uJC8s5I4tS4LdKbjiL8eKXPRJGCBS4PpYfDJiHIaM4xxHjEwa5qY0AvU/hPPkXW06 ILgZ4tGbvO6QlDtH2KsCK+TWTG+XlOkbw4n936V1s/kzoHR8foN2GCY2FebWdEStzP0IjAMElSo g3XPxpjxxk= X-Received: by 2002:a05:600c:4f43:b0:490:b642:ce31 with SMTP id 5b1f17b1804b1-49266838e92mr178063285e9.2.1782623106568; Sat, 27 Jun 2026 22:05:06 -0700 (PDT) Received: from dohko.chello.ie (188-141-5-72.dynamic.upc.ie. [188.141.5.72]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-493a4cc6659sm54089415e9.13.2026.06.27.22.05.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 27 Jun 2026 22:05:06 -0700 (PDT) From: David Carlier To: Daniel Scally , Jacopo Mondi Cc: Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, David Carlier Subject: [PATCH] media: mali-c55: Fix double mutex_destroy on capture dev register error Date: Sun, 28 Jun 2026 06:05:03 +0100 Message-ID: <20260628050503.16048-1-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In mali_c55_register_cap_dev(), a failure of media_entity_pads_init() destroys cap_dev->lock inline and then jumps to err_destroy_mutex, which destroys the same mutex a second time. The switch default case just above already handles this correctly by jumping straight to the label without an inline destroy. Drop the inline mutex_destroy() and rely on the err_destroy_mutex label, so the mutex is destroyed exactly once on every error path. Fixes: d5f281f3dd29 ("media: mali-c55: Add Mali-C55 ISP driver") Signed-off-by: David Carlier --- drivers/media/platform/arm/mali-c55/mali-c55-capture.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/media/platform/arm/mali-c55/mali-c55-capture.c b/drivers/media/platform/arm/mali-c55/mali-c55-capture.c index 7aaa5c3f7..ff0155302 100644 --- a/drivers/media/platform/arm/mali-c55/mali-c55-capture.c +++ b/drivers/media/platform/arm/mali-c55/mali-c55-capture.c @@ -857,10 +857,8 @@ static int mali_c55_register_cap_dev(struct mali_c55 *mali_c55, cap_dev->pad.flags = MEDIA_PAD_FL_SINK; ret = media_entity_pads_init(&cap_dev->vdev.entity, 1, &cap_dev->pad); - if (ret) { - mutex_destroy(&cap_dev->lock); + if (ret) goto err_destroy_mutex; - } vb2q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; vb2q->io_modes = VB2_MMAP | VB2_DMABUF; -- 2.53.0