From patchwork Mon Jan 13 19:13:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Draszik?= X-Patchwork-Id: 857165 Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (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 537F31C54B2 for ; Mon, 13 Jan 2025 19:13:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736795630; cv=none; b=RUfFDkXUPUjZTt0vpHHzQsJxs4nm3M1+vRh88DJjtxbxMo3Q+AbFWOrPYA4iiJH0E0g6/D6Y+RBJs8sIOMCMfGMGwUydwQ5eoZOrjRJYk0vX+9fNJAv9Ma5zN+9anUSPaPGa5mDt/DXVU0upCReC5GiOOVEYUNeIv+NZQR93s7E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736795630; c=relaxed/simple; bh=AyBbVigURVmoxDC6lvxqTJAh2m5iJC3eOggNKLZYlZk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=GFNpSrGqf8ituBQBd8/sQEIPsd+79NUcjfuLwL8ZEtRHuhHB5YlZy32DN71Ci4hCcMgLzxO2EPn50dKQ6xAY4N7bFanpyeH6tu04U1l/9VwkoOOtGqRZvqF9Xp8RWBT4Jti8E5wTaEh0Ju+1uojd6KtmHgRA/HH5px20yY42HcE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=EWmruOhC; arc=none smtp.client-ip=209.85.208.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="EWmruOhC" Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-5d3f28a4fccso6784717a12.2 for ; Mon, 13 Jan 2025 11:13:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736795627; x=1737400427; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=OE33POUt2+iszfpt20Nqlmknt+0wqjiuw4LPVCBXmGE=; b=EWmruOhCUMAVZfwU5D6yeW2lJ1ub8WC+HECdli/FozkfI0BYlkaHDMXKpmzb77Pm3M vY6SqZLZlOyj3T15FuqQvADleITJoY6gyayr2uzKiS96cmr2TexSYv7+7v7CfulJnhZh QKgFg6KUU4QBb8eZSuWl03krjpqppeL+pGY+NGhUhZKbBLLjUStyfmBNqaHDQKcNWIsy 6p73dBGEdR+u0T4EBhJhWJkPnEYeyOGu2+p6uMFThvRFKvZQ3oZ3VbxF1YUM3TRgVurp tbTuHKrDPqdXJ6DbZ8oxng/p/7D3IdHvWaTwQnurukfLr8873L9VHT1Xgb0FZKy0JXlw 8Klg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736795627; x=1737400427; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=OE33POUt2+iszfpt20Nqlmknt+0wqjiuw4LPVCBXmGE=; b=kNlTsMORmxUkNyKAI4GUOZvYqs+Js36EAGK1UWwJq5tNnwSkMPpALfq3E7gg4+G7FN FQ1DRBtthe2CF0j8bkkMAZBhuK2i3skSRBCWk/MvI3iu2qAXY3g281J1er0+8rh89Ts2 ZMIXlG+BT79y4FfPIZTGMFtSltEkFazaDKA9iEe3uL4M+8pXfF9wr4mMSFqdQvjFA6Mr Qkd83enq9qxd/HS8kzoKqfMOQP3mSakZKkc94bJM60S8Y5QCeHU/wAQHcBdEP/iam7vi U4TK2wyhzQytMLMqXIhKvxqgr63fxhnP5/Nh7PLvE9/WI6NUvuXt4GxQtLt4aYIkNKoD 2C6g== X-Forwarded-Encrypted: i=1; AJvYcCWeNRN8cg80krB+hHjueptJZFCIe/wOJsgWVYmpvXld2WbZTNqU+OcJeUqf7vvww/RUyD+QmBgE1446/tVFG46N4g==@vger.kernel.org X-Gm-Message-State: AOJu0YzRLL8BrWeygEEvG5CaMwkDfLN6CHrpziR/u8DEXDspVYzk6vhG WuJ1vViJUkg8Z2n9uykAtZhSyYXkit4jtkY1I73o7/tE9YizkSwXQHHWfeR619I= X-Gm-Gg: ASbGncv+se//qcZSrMld+PTZy642J9XZFYfWwjYVUew6kfKBkFDx7391ZV8ZcV2LEeQ CT3Lz6T28hRJVFxEWMobWS7dkPSQk0oRuaAkOdihh5YFVqiuNUuzTKuDgGNwWguupFci3MaU0nx +/5HkKZNmkdvH8ActHAu0PV3/viQhnBWOsMAxRXwhndCXhK/eizj910oNQzRtYaT+GgIvrAqVTC vTDuiWlUjiO9Qp494kuMNGTj9Yco/1mcVmT7h8QkkujFR4XX2gcLitityflaVEmn5vyMq6xMq8A rjXFB5dqGSVVdTvp7dzdhPfyAmswGGqBw65Y46kS X-Google-Smtp-Source: AGHT+IHCboU7f9NwsTjWB7S/v4RS6GfG3YG/9+YBh8V6k+rI8SG1CJroMnepLppBr6OtsLwC4toMYg== X-Received: by 2002:a05:6402:254b:b0:5cf:e9d6:cc8a with SMTP id 4fb4d7f45d1cf-5d972e1a09cmr20527141a12.20.1736795626519; Mon, 13 Jan 2025 11:13:46 -0800 (PST) Received: from puffmais.c.googlers.com (140.20.91.34.bc.googleusercontent.com. [34.91.20.140]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5d9903c2d58sm5238605a12.39.2025.01.13.11.13.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jan 2025 11:13:46 -0800 (PST) From: =?utf-8?q?Andr=C3=A9_Draszik?= Date: Mon, 13 Jan 2025 19:13:45 +0000 Subject: [PATCH] scsi: ufs: pltfrm: fix use-after free in init error and remove paths Precedence: bulk X-Mailing-List: linux-samsung-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250113-ufshcd-fix-v1-1-ca63d1d4bd55@linaro.org> X-B4-Tracking: v=1; b=H4sIAOhlhWcC/x2MQQqAIBAAvxJ7TtA1D/WV6BC6m3uxUIpA/HvSc QZmKhTKQgWWoUKmR4qcqYMZB/BxTwcpCZ0BNTptjFU3l+iDYnmVw0nPjMEiM/TgytT1P1u31j6 1C2T/XAAAAA== To: Alim Akhtar , Avri Altman , Bart Van Assche , "James E.J. Bottomley" , "Martin K. Petersen" , Peter Griffin , Krzysztof Kozlowski , Manivannan Sadhasivam Cc: Tudor Ambarus , Will McVicker , kernel-team@android.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, =?utf-8?q?Andr=C3=A9_Draszik?= X-Mailer: b4 0.13.0 devm_blk_crypto_profile_init() registers a cleanup handler to run when the associated (platform-) device is being released. For UFS, the crypto private data and pointers are stored as part of the ufs_hba's data structure 'struct ufs_hba::crypto_profile'. This structure is allocated as part of the underlying ufshd allocation. During driver release or during error handling in ufshcd_pltfrm_init(), this structure is released as part of ufshcd_dealloc_host() before the (platform-) device associated with the crypto call above is released. Once this device is released, the crypto cleanup code will run, using the just-released 'struct ufs_hba::crypto_profile'. This causes a use-after-free situation: exynos-ufshc 14700000.ufs: ufshcd_pltfrm_init() failed -11 exynos-ufshc 14700000.ufs: probe with driver exynos-ufshc failed with error -11 Unable to handle kernel paging request at virtual address 01adafad6dadad88 Mem abort info: ESR = 0x0000000096000004 EC = 0x25: DABT (current EL), IL = 32 bits SET = 0, FnV = 0 EA = 0, S1PTW = 0 FSC = 0x04: level 0 translation fault Data abort info: ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000 CM = 0, WnR = 0, TnD = 0, TagAccess = 0 GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 [01adafad6dadad88] address between user and kernel address ranges Internal error: Oops: 0000000096000004 [#1] PREEMPT SMP Modules linked in: CPU: 0 UID: 0 PID: 1 Comm: swapper/0 Tainted: G W 6.13.0-rc5-next-20250106+ #70 Tainted: [W]=WARN Hardware name: Oriole (DT) pstate: 20400005 (nzCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : kfree+0x60/0x2d8 lr : kvfree+0x44/0x60 sp : ffff80008009ba80 x29: ffff80008009ba90 x28: 0000000000000000 x27: ffffbcc6591e0130 x26: ffffbcc659309960 x25: ffffbcc658f89c50 x24: ffffbcc659539d80 x23: ffff22e000940040 x22: ffff22e001539010 x21: ffffbcc65714b22c x20: 6b6b6b6b6b6b6b6b x19: 01adafad6dadad80 x18: 0000000000000000 x17: ffffbcc6579fbac8 x16: ffffbcc657a04300 x15: ffffbcc657a027f4 x14: ffffbcc656f969cc x13: ffffbcc6579fdc80 x12: ffffbcc6579fb194 x11: ffffbcc6579fbc34 x10: 0000000000000000 x9 : ffffbcc65714b22c x8 : ffff80008009b880 x7 : 0000000000000000 x6 : ffff80008009b940 x5 : ffff80008009b8c0 x4 : ffff22e000940518 x3 : ffff22e006f54f40 x2 : ffffbcc657a02268 x1 : ffff80007fffffff x0 : ffffc1ffc0000000 Call trace: kfree+0x60/0x2d8 (P) kvfree+0x44/0x60 blk_crypto_profile_destroy_callback+0x28/0x70 devm_action_release+0x1c/0x30 release_nodes+0x6c/0x108 devres_release_all+0x98/0x100 device_unbind_cleanup+0x20/0x70 really_probe+0x218/0x2d0 In other words, the initialisation code flow is: platform-device probe ufshcd_pltfrm_init() ufshcd_alloc_host() scsi_host_alloc() allocation of struct ufs_hba creation of scsi-host devices devm_blk_crypto_profile_init() devm registration of cleanup handler using platform-device and during error handling of ufshcd_pltfrm_init() or during driver removal: ufshcd_dealloc_host() scsi_host_put() put_device(scsi-host) release of struct ufs_hba put_device(platform-device) crypto cleanup handler To fix this use-after free, register the crypto cleanup handler against the scsi-host device instead, so that it runs before release of struct ufs_hba. Signed-off-by: André Draszik --- In my case, as per above trace I initially encountered an error in ufshcd_verify_dev_init(), which made me notice this problem. For reproducing, it'd be possible to change that function to just return an error. Other approaches for solving this issue I see are the following, but I believe this one here is the cleanest: * turn 'struct ufs_hba::crypto_profile' into a dynamically allocated pointer, in which case it doesn't matter if cleanup runs after scsi_host_put() * add an explicit devm_blk_crypto_profile_deinit() to be called by API users when necessary, e.g. before ufshcd_dealloc_host() in this case --- drivers/ufs/core/ufshcd-crypto.c | 2 +- drivers/ufs/host/ufs-exynos.c | 3 ++- drivers/ufs/host/ufs-qcom.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) --- base-commit: 4e16367cfe0ce395f29d0482b78970cce8e1db73 change-id: 20250113-ufshcd-fix-52409f2d32ff Best regards, diff --git a/drivers/ufs/core/ufshcd-crypto.c b/drivers/ufs/core/ufshcd-crypto.c index 694ff7578fc1..cb9db79ca185 100644 --- a/drivers/ufs/core/ufshcd-crypto.c +++ b/drivers/ufs/core/ufshcd-crypto.c @@ -177,7 +177,7 @@ int ufshcd_hba_init_crypto_capabilities(struct ufs_hba *hba) /* The actual number of configurations supported is (CFGC+1) */ err = devm_blk_crypto_profile_init( - hba->dev, &hba->crypto_profile, + &hba->host->shost_gendev, &hba->crypto_profile, hba->crypto_capabilities.config_count + 1); if (err) goto out; diff --git a/drivers/ufs/host/ufs-exynos.c b/drivers/ufs/host/ufs-exynos.c index 13dd5dfc03eb..6874c769b697 100644 --- a/drivers/ufs/host/ufs-exynos.c +++ b/drivers/ufs/host/ufs-exynos.c @@ -1312,7 +1312,8 @@ static void exynos_ufs_fmp_init(struct ufs_hba *hba, struct exynos_ufs *ufs) } /* Advertise crypto capabilities to the block layer. */ - err = devm_blk_crypto_profile_init(hba->dev, profile, 0); + err = devm_blk_crypto_profile_init(&hba->host->shost_gendev, + profile, 0); if (err) { /* Only ENOMEM should be possible here. */ dev_err(hba->dev, "Failed to initialize crypto profile: %d\n", diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c index 23b9f6efa047..d0a1e0f20a2f 100644 --- a/drivers/ufs/host/ufs-qcom.c +++ b/drivers/ufs/host/ufs-qcom.c @@ -141,7 +141,8 @@ static int ufs_qcom_ice_init(struct ufs_qcom_host *host) caps.reg_val = cpu_to_le32(ufshcd_readl(hba, REG_UFS_CCAP)); /* The number of keyslots supported is (CFGC+1) */ - err = devm_blk_crypto_profile_init(dev, profile, caps.config_count + 1); + err = devm_blk_crypto_profile_init(&hba->host->shost_gendev, profile, + caps.config_count + 1); if (err) return err;