From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miao Wang Date: Wed, 08 Jul 2026 05:16:25 +0800 Subject: [PATCH RFC v2 1/7] mfd: ls2kbmc: Make a copy when parsing mode string MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260708-ls2kbmc-mod-v2-1-2afdd1741766@gmail.com> References: <20260708-ls2kbmc-mod-v2-0-2afdd1741766@gmail.com> In-Reply-To: <20260708-ls2kbmc-mod-v2-0-2afdd1741766@gmail.com> To: Binbin Zhou , Chong Qiao , Lee Jones , Huacai Chen , Corey Minyard , Linus Walleij , Bartosz Golaszewski Cc: Xi Ruoyao , WANG Xuerui , Yinbo Zhu , Jiaxun Yang , mfd@lists.linux.dev, linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, openipmi-developer@lists.sourceforge.net, Miao Wang X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2561; i=shankerwangmiao@gmail.com; s=20250715; h=from:subject:message-id; bh=6DIyNM6vk8kNUgYv2UMACNnAgWrwjVEMmwrMrjQaG1w=; b=owEBbQKS/ZANAwAKAbAx48p7/tluAcsmYgBqTWy19IRO6kJx+wgwDjY+Gr9pFUdAunMdwAbHG yDfdmHrNGiJAjMEAAEKAB0WIQREqPWPgPJBxluezBOwMePKe/7ZbgUCak1stQAKCRCwMePKe/7Z bj+CEACcouo9KNhPTaQIp8k7Po7kUn4kqg24cpkqk5NAzahEdZIHoDSjctpOk6jjT4Ew1A1iU2t 50QWaw6OCoO5efROqKHpvxhaQHKQlPJOjbzCEU84SVfTzYG9GQM5i4rvN7a12Xx264PCUup+oUG D6iR+gXK6cs60YBjEpf8E5RWPm+e2AklwzH6RK4W37QnHsbm80clBqKQBWhmKu9IHhvD3YH+lFV EK+KeimG2445jhlW2QrgKW9iOoXpiYuaTEGL+rq8SYJQ3DO56j3XUFVzIyATdvJfCqSFA0sXcCX Qed2FGp/fVGhlSWhdHi1cy5o0pkIUyhDUSXBIRFKMsaxVG65PqIokrTqQz+EF85nOO2O8jcbjfR Dlf8QSvxYdjlrqyB68cRVtwiCusb6MXjuSEmpH0BobJJY9WAChIwsMfvQ9d3ZBM1AVBYSgxJqts 3+BmCz7pgzZX7H2OBex31p28lTKLle90qnFv6VuuzzCTO137yeUJNOCXTtMenRWSUucdIRNGxTm G/MOR8nMpdWu2tSjOiibnn2PQgyNPBV1F6/Y12uX6m+OduXrPRGEsjFpQ/mt6AGezTdHPp+RVWp ReyN0zhCDvaUgnWHyr/Ski2DLhEk6sCyQn4ZDpvo0AkoKg4dw9tDH27WIpqdFTQosopFAZ5aszg Hjp4B7tgzKeAHgA== X-Developer-Key: i=shankerwangmiao@gmail.com; a=openpgp; fpr=6FAEFF06B7D212A774C60BFDFA0D166D6632EF4A X-Endpoint-Received: by B4 Relay for shankerwangmiao@gmail.com/20250715 with auth_id=462 List-Id: B4 Relay Submissions When parsing the mode string from BMC, the string is manipulated in-place with strsep(), preventing from parsing it again. Make a copy of the original string and manipulate the copy instead to fix this. Fixes: 0d64f6d1ffe9 ("mfd: ls2kbmc: Introduce Loongson-2K BMC core driver") Signed-off-by: Miao Wang --- drivers/mfd/ls2k-bmc-core.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/ls2k-bmc-core.c b/drivers/mfd/ls2k-bmc-core.c index 408056bfb2fe757a5bde43775a483a48352e706d..27f6e096404d67459038a0607378057ec7ef69ab 100644 --- a/drivers/mfd/ls2k-bmc-core.c +++ b/drivers/mfd/ls2k-bmc-core.c @@ -427,34 +427,54 @@ static int ls2k_bmc_init(struct ls2k_bmc_ddata *ddata) */ static int ls2k_bmc_parse_mode(struct pci_dev *pdev, struct simplefb_platform_data *pd) { - char *mode; + /* Assume 64 bytes is enough for the resolution string */ + char mode_buf[64], mode_buf_orig[64]; + char *mode = mode_buf; + const void __iomem *mode_base; int depth, ret; /* The last 16M of PCI BAR0 is used to store the resolution string. */ - mode = devm_ioremap(&pdev->dev, pci_resource_start(pdev, 0) + SZ_16M, SZ_16M); - if (!mode) + mode_base = ioremap(pci_resource_start(pdev, 0) + SZ_16M, + sizeof(mode_buf)); + if (!mode_base) return -ENOMEM; + memcpy_fromio(mode_buf, mode_base, sizeof(mode_buf) - 1); + mode_buf[sizeof(mode_buf) - 1] = '\0'; + iounmap((void __iomem *)mode_base); + memcpy(mode_buf_orig, mode_buf, sizeof(mode_buf_orig)); /* The resolution field starts with the flag "video=". */ if (!strncmp(mode, "video=", 6)) mode = mode + 6; + else + goto invalid_mode; - ret = kstrtoint(strsep(&mode, "x"), 10, &pd->width); + ret = kstrtouint(strsep(&mode, "x"), 10, &pd->width); if (ret) return ret; + if (mode == NULL) + goto invalid_mode; - ret = kstrtoint(strsep(&mode, "-"), 10, &pd->height); + ret = kstrtouint(strsep(&mode, "-"), 10, &pd->height); if (ret) return ret; + if (mode == NULL) + goto invalid_mode; ret = kstrtoint(strsep(&mode, "@"), 10, &depth); if (ret) return ret; + if (mode == NULL) + goto invalid_mode; pd->stride = pd->width * depth / 8; pd->format = depth == 32 ? "a8r8g8b8" : "r5g6b5"; return 0; + +invalid_mode: + dev_err(&pdev->dev, "Invalid resolution string: %s\n", mode_buf_orig); + return -EINVAL; } static int ls2k_bmc_probe(struct pci_dev *dev, const struct pci_device_id *id) -- 2.49.0