From 1050d7ceb29b7827f4dc1f7be2f75a1c18fb31df Mon Sep 17 00:00:00 2001 From: wangxin Date: Mon, 14 Oct 2024 16:49:12 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=86=85=E6=A0=B8=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=80=82=E9=85=8D"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 1b275ee0e0943924fc2aa8519a2ce2dc0f2134c1. Reason: CVE-2021-47469 is not related to Openharmony-4.0-Release branch. Signed-off-by: wangxin --- .../hispark_taurus_patch/hispark_taurus.patch | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/linux-5.10/hispark_taurus_patch/hispark_taurus.patch b/linux-5.10/hispark_taurus_patch/hispark_taurus.patch index 2076a8f..5d33f9b 100755 --- a/linux-5.10/hispark_taurus_patch/hispark_taurus.patch +++ b/linux-5.10/hispark_taurus_patch/hispark_taurus.patch @@ -25241,11 +25241,19 @@ diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 94caee49d..c69c59dcb 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c -@@ -536,18 +536,16 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md, - return err; +@@ -448,7 +448,7 @@ static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms, + static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md, + struct mmc_blk_ioc_data *idata) + { +- struct mmc_command cmd = {}, sbc = {}; ++ struct mmc_command cmd = {}; + struct mmc_data data = {}; + struct mmc_request mrq = {}; + struct scatterlist sg; +@@ -525,15 +525,15 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md, } -- if (idata->rpmb || prev_idata) { + if (idata->rpmb) { - sbc.opcode = MMC_SET_BLOCK_COUNT; - /* - * We don't do any blockcount validation because the max size @@ -25253,11 +25261,8 @@ index 94caee49d..c69c59dcb 100644 - * 'Reliable Write' bit here. - */ - sbc.arg = data.blocks | (idata->ic.write_flag & BIT(31)); -- if (prev_idata) -- sbc.arg = prev_idata->ic.arg; - sbc.flags = MMC_RSP_R1 | MMC_CMD_AC; - mrq.sbc = &sbc; -+ if (idata->rpmb) { + struct mmc_command mmc_cmd = {}; + mmc_cmd.opcode = MMC_SET_BLOCK_COUNT; + mmc_cmd.arg = data.blocks & 0x0000FFFF; -- Gitee