From patchwork Wed Oct 23 05:24:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13846461 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (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 6FA08146000 for ; Wed, 23 Oct 2024 05:24:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729661096; cv=none; b=Axe4Mwte+7O1ogPIPyXalW4cu+H+Btv2hWTNTrieoshImFsbec817IGbpsT12TRaHXGgjlBDky/XrMfHlQvUaTRtTFWpa+/EpFoYEcqPgF66KkUr8ESfuGP42CU6Y/eBTcOmhWJVGkZDcHSCz95ksbCEWezDtoKSPU52jv95YR4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729661096; c=relaxed/simple; bh=o/fVb/rPrIPHMs3QGTbUUPiMExCk4zRccUoj0Y/1QDs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZJ/Mjsa67Kxcx69wHRSKIEyV25o4nNpPdAfB7Uu32V/LGUzQgpai0QVnEjGzfAlA0lY0al2z4f7goLK4cZEj8Powz7MOmIE5WVlJ5hjztXOyHagB9kwwru+b/PUTESgBkR+M4Q3qz25d9f1iR53WPBMnplq3sBTVwv1jPf97Clg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=Q7uksv+D; arc=none smtp.client-ip=209.85.216.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Q7uksv+D" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-2e2e2d09decso364772a91.1 for ; Tue, 22 Oct 2024 22:24:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1729661095; x=1730265895; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T9uAXGz+Gbunwh+KLn0sQpSbpt7P3BrgYTjoz3sK6n0=; b=Q7uksv+DZwuq/UqU8wfWoISkfS9sEvWbVFX4BqARn7ZXQFRrk7cVCNzO8CFInIc7dR yyOCjUQPjNKTcsXOUr6QTxqjCkDrrtS9d0cg1WYgAoNNI2wf2tGpKmrrHqrmfRXzjYx+ KxQLjKVdNv3lijfgeEFwqqLvysKQY8Pp8XyrU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729661095; x=1730265895; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T9uAXGz+Gbunwh+KLn0sQpSbpt7P3BrgYTjoz3sK6n0=; b=KOrPL6vti2/RZsyNrV17AIYpnVMPwqC8FEf3b9g+1xIYWLcVCti20LOPmIBZpFQXSR 4rUu2h5ToNIXAN0fAqDLXyXHn0v36X21ZoaYK+bEnHQHs2h9VTYpWAff0FbKGWdj9zWz ofZNpXdpve7oOrogFCFHbLCbQbHxs2ZLfA2RErCuG/4jF6MQrBlXnc/1h57Zpa7iIOh+ Y24Feg6bFsSKOOCte4RBtMsraYfqaVzJjEyEvNemmHzVmTtuPwNfBQ2fNpIk/skrLshV +r4HcHZK/ujFxYiDSIB/HMbsK/y8bGXH7Y+FpnzIxlxOFSfl/iQz7Xmjh8A7DpULnM7Q g3BQ== X-Forwarded-Encrypted: i=1; AJvYcCU1SBFDKJcAz0USquwIpUwav1DgCrv97/5rsge2YkBvJr4GNssfciEge8idTVoLfWMNAAc2ZLUuElLRmg==@vger.kernel.org X-Gm-Message-State: AOJu0YyJr6fX+Ny5jkmHKtMELOfEEd0lLy88HV2efBCKdzPNcW3bhCz1 aYymKpFVHVbnpFf+b3KWNIPnoTNslupotkSFjF54ke5vwSfgOcBL0pVOlcxex8PK0CvZZewgCRu RmQ== X-Google-Smtp-Source: AGHT+IHpp7Yxa5X9fJ+XfPUvT5pFQyWWbt/3ZgxyXYiMvClBkmvZ39OcJGcf98L+305sXmyfNAvYaw== X-Received: by 2002:a17:90a:ae17:b0:2e2:e086:f5c0 with SMTP id 98e67ed59e1d1-2e5db93c457mr8706469a91.5.1729661094727; Tue, 22 Oct 2024 22:24:54 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:eec8:692:e549:d490]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e76e088f1fsm413112a91.56.2024.10.22.22.24.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 22:24:54 -0700 (PDT) From: Sergey Senozhatsky To: Stanimir Varbanov , Vikash Garodia Cc: Bryan O'Donoghue , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky , Tomasz Figa Subject: [PATCH 1/2] media: venus: fix enc/dec destruction order Date: Wed, 23 Oct 2024 14:24:21 +0900 Message-ID: <20241023052444.139356-2-senozhatsky@chromium.org> X-Mailer: git-send-email 2.47.0.105.g07ac214952-goog In-Reply-To: <20241023052444.139356-1-senozhatsky@chromium.org> References: <20241023052444.139356-1-senozhatsky@chromium.org> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We destroy mutex-es too early as they are still taken in v4l2_fh_exit()->v4l2_event_unsubscribe()->v4l2_ctrl_find(). We should destroy mutex-es right before kfree(). Also do not vdec_ctrl_deinit() before v4l2_fh_exit(). Suggested-by: Tomasz Figa Signed-off-by: Sergey Senozhatsky --- drivers/media/platform/qcom/venus/vdec.c | 7 ++++--- drivers/media/platform/qcom/venus/venc.c | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index 6252a6b3d4ba..0013c4704f03 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -1752,13 +1752,14 @@ static int vdec_close(struct file *file) cancel_work_sync(&inst->delayed_process_work); v4l2_m2m_ctx_release(inst->m2m_ctx); v4l2_m2m_release(inst->m2m_dev); - vdec_ctrl_deinit(inst); ida_destroy(&inst->dpb_ids); hfi_session_destroy(inst); - mutex_destroy(&inst->lock); - mutex_destroy(&inst->ctx_q_lock); v4l2_fh_del(&inst->fh); v4l2_fh_exit(&inst->fh); + vdec_ctrl_deinit(inst); + + mutex_destroy(&inst->lock); + mutex_destroy(&inst->ctx_q_lock); vdec_pm_put(inst, false); diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c index 322a7737e2c7..6a26a6592424 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -1519,14 +1519,14 @@ static int venc_close(struct file *file) v4l2_m2m_ctx_release(inst->m2m_ctx); v4l2_m2m_release(inst->m2m_dev); - venc_ctrl_deinit(inst); hfi_session_destroy(inst); - mutex_destroy(&inst->lock); - mutex_destroy(&inst->ctx_q_lock); v4l2_fh_del(&inst->fh); v4l2_fh_exit(&inst->fh); + venc_ctrl_deinit(inst); inst->enc_state = VENUS_ENC_STATE_DEINIT; + mutex_destroy(&inst->lock); + mutex_destroy(&inst->ctx_q_lock); venc_pm_put(inst, false); From patchwork Wed Oct 23 05:24:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 13846462 Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) (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 C539E146D6F for ; Wed, 23 Oct 2024 05:24:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729661100; cv=none; b=T2Pb+1qW9eMyRApCQUe2gJiMtl4R4KwM43wSIDHSDtiLr3WKqSjeiQbtdVZb/vG0YnteCzFGHD5+6gPQ92Eb59IEhiFvEiQP1RL8CIXL9/uSYI+u+Ftga11emHX2JFmVlq+JcoZqx0DwAsPhvC/yIYvkP4Uu94YkleqLLyxphwI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729661100; c=relaxed/simple; bh=MCmETfZcZj5n6OFijgJ/yWX5JAS0t9EX0hV8HW73GUE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=knQVKqMgj7OK5JpZ3wXadvAWcKJ6SpWYt3b86xKE+qoWJCT6mCXsfN6bXvte0a+HmbjVkVr5Yd+Hi4eQlPRpCths8rO6A6DElpVKJTEDUBA/BvvfVVCwBu3L9gQ9Br4Fp4XYMe/FmjA+VQYCc6KKYbLwPmO0inhV/+RvDgW+62I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=OPUpHMEB; arc=none smtp.client-ip=209.85.215.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="OPUpHMEB" Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-7db90a28cf6so343435a12.0 for ; Tue, 22 Oct 2024 22:24:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1729661098; x=1730265898; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d15nvcJtJm0xxzKGhSuaLpa/avMIoSmpwjQhzt/2TMY=; b=OPUpHMEBzzn/pIkJ4eEBTCeK3ii2CB3ukjxTo2LNP9G0ta8nO0i3C0ZXjF2uctf9+l rrmZgqvaVa7Be2kev4sOvL3GtnNmMKfy/FqOoi7qqkVCaTi06fUseqjJw1hwlvJeDvjo MZ0jeS3l/PvYqWvNGeNVweXbQbIVMFKzc9Vtw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729661098; x=1730265898; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d15nvcJtJm0xxzKGhSuaLpa/avMIoSmpwjQhzt/2TMY=; b=bTrEkxXROId+0ChVdAk3dyNWdE6tIViSY9y5HAaTZ7GZKR0Egd3keQhA1w6xMvJJS7 GTqR11/q+vs+Vqnt3atHzhmyeYIRrVOGlxzRTPlWtIMH9Qo6jk1wbJKvLrGriBaEC1gA Eq0o2U4xgK5tP3shh0fiNby5hK4IHnTIQlGtaPuCftRuQ89qPEqogzhIVxA4j2+BsY2S wtoh0lZZPWSqa54J9PzRDs9GbulIxMKMqiu1i636H/U+xow35i+oirIvSV2Ub2LbXu1c zTaRFY9jr8kd3CMRK+0e/BoM/fjUwf3wSov+7jCGU4ni1QhGUpIqOelds7WH4xBX7qEC utUw== X-Forwarded-Encrypted: i=1; AJvYcCUsU1qTkUq9KwQh22KFvA+JX5bYo/4nFFG4IXkvXxNykD1UOrUHDKEZlNE5vCHqBhFM+2Y5KSrSMUPLuw==@vger.kernel.org X-Gm-Message-State: AOJu0YyEQNh799FtSZ1mu0F1075prP3pfi6ef6Quz+nWX8wO7fOBN3qh HOFgcqryMyXrunZYBYdKXaapd60ownqavJoTAOG2km2+xfkOu4DtM26RhUIX2Q== X-Google-Smtp-Source: AGHT+IHl3D8Qkd/KZA/PXyc+r9DQ/C5MkJdw5siV/LSFX5r2bUqo8lUiyR9QO9wbsDE6IHWw+loMsA== X-Received: by 2002:a17:90a:ae17:b0:2e2:e086:f5c0 with SMTP id 98e67ed59e1d1-2e5db93c457mr8706614a91.5.1729661098051; Tue, 22 Oct 2024 22:24:58 -0700 (PDT) Received: from tigerii.tok.corp.google.com ([2401:fa00:8f:203:eec8:692:e549:d490]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e76e088f1fsm413112a91.56.2024.10.22.22.24.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 22:24:57 -0700 (PDT) From: Sergey Senozhatsky To: Stanimir Varbanov , Vikash Garodia Cc: Bryan O'Donoghue , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCH 2/2] media: venus: sync with threaded IRQ during inst destruction Date: Wed, 23 Oct 2024 14:24:22 +0900 Message-ID: <20241023052444.139356-3-senozhatsky@chromium.org> X-Mailer: git-send-email 2.47.0.105.g07ac214952-goog In-Reply-To: <20241023052444.139356-1-senozhatsky@chromium.org> References: <20241023052444.139356-1-senozhatsky@chromium.org> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When destroy inst we should make sure that we don't race against threaded IRQ (or pending IRQ), otherwise we can concurrently kfree() inst context and inst itself. BUG: KASAN: slab-use-after-free in vb2_queue_error+0x80/0x90 Call trace: dump_backtrace+0x1c4/0x1f8 show_stack+0x38/0x60 dump_stack_lvl+0x168/0x1f0 print_report+0x170/0x4c8 kasan_report+0x94/0xd0 __asan_report_load2_noabort+0x20/0x30 vb2_queue_error+0x80/0x90 venus_helper_vb2_queue_error+0x54/0x78 venc_event_notify+0xec/0x158 hfi_event_notify+0x878/0xd20 hfi_process_msg_packet+0x27c/0x4e0 venus_isr_thread+0x258/0x6e8 hfi_isr_thread+0x70/0x90 venus_isr_thread+0x34/0x50 irq_thread_fn+0x88/0x130 irq_thread+0x160/0x2c0 kthread+0x294/0x328 ret_from_fork+0x10/0x20 Allocated by task 20291: kasan_set_track+0x4c/0x80 kasan_save_alloc_info+0x28/0x38 __kasan_kmalloc+0x84/0xa0 kmalloc_trace+0x7c/0x98 v4l2_m2m_ctx_init+0x74/0x280 venc_open+0x444/0x6d0 v4l2_open+0x19c/0x2a0 chrdev_open+0x374/0x3f0 do_dentry_open+0x710/0x10a8 vfs_open+0x88/0xa8 path_openat+0x1e6c/0x2700 do_filp_open+0x1a4/0x2e0 do_sys_openat2+0xe8/0x508 do_sys_open+0x15c/0x1a0 __arm64_sys_openat+0xa8/0xc8 invoke_syscall+0xdc/0x270 el0_svc_common+0x1ec/0x250 do_el0_svc+0x54/0x70 el0_svc+0x50/0xe8 el0t_64_sync_handler+0x48/0x120 el0t_64_sync+0x1a8/0x1b0 Guard inst destruction (both dec and enc) with hard and threaded IRQ synchronization. Signed-off-by: Sergey Senozhatsky --- drivers/media/platform/qcom/venus/vdec.c | 13 +++++++++++++ drivers/media/platform/qcom/venus/venc.c | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index 0013c4704f03..ff1823bc967c 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -1747,6 +1747,13 @@ static int vdec_close(struct file *file) { struct venus_inst *inst = to_inst(file); + /* + * Make sure we don't have pending IRQs and no threaded IRQ handler is + * running nor pending (synchronize_irq)), which can race with inst + * destruction. + */ + disable_irq(inst->core->irq); + vdec_pm_get(inst); cancel_work_sync(&inst->delayed_process_work); @@ -1763,6 +1770,12 @@ static int vdec_close(struct file *file) vdec_pm_put(inst, false); + /* + * inst is gone from the core->instances list, re-enable IRQ and + * threaded IRQ + */ + enable_irq(inst->core->irq); + kfree(inst); return 0; } diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c index 6a26a6592424..6575e84312fe 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -1515,6 +1515,13 @@ static int venc_close(struct file *file) { struct venus_inst *inst = to_inst(file); + /* + * Make sure we don't have pending IRQs and no threaded IRQ handler is + * running nor pending (synchronize_irq)), which can race with inst + * destruction. + */ + disable_irq(inst->core->irq); + venc_pm_get(inst); v4l2_m2m_ctx_release(inst->m2m_ctx); @@ -1530,6 +1537,12 @@ static int venc_close(struct file *file) venc_pm_put(inst, false); + /* + * inst is gone from the core->instances list, re-enable IRQ and + * threaded IRQ + */ + enable_irq(inst->core->irq); + kfree(inst); return 0; }