From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miao Wang Date: Wed, 05 Aug 2026 03:14:19 +0800 Subject: [PATCH RFC v6 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: <20260805-ls2kbmc-mod-v6-1-16ccde412d86@gmail.com> References: <20260805-ls2kbmc-mod-v6-0-16ccde412d86@gmail.com> In-Reply-To: <20260805-ls2kbmc-mod-v6-0-16ccde412d86@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=2609; i=shankerwangmiao@gmail.com; s=20250715; h=from:subject:message-id; bh=U6cr9tgtHDx0WKodEY4FvK4JRMLlLLDCHMpw0TehXDs=; b=owEBbQKS/ZANAwAKAbAx48p7/tluAcsmYgBqcjoXAIlTsV17FkSwaO5PMin8sRqt+4AxAmMxr 1OH2mR3rvOJAjMEAAEKAB0WIQREqPWPgPJBxluezBOwMePKe/7ZbgUCanI6FwAKCRCwMePKe/7Z btadD/9hTe+oj0gZl4mLlDWhZuHUg+ikGyXw9m3mhvedwqYJVckl9CUNObixytNroc3WPQ5Mpo6 eeF+NrmkkP42tWaZhZ6gfjTONHR5hD+g5gizI9UlyFbVtYphasiiTmuEDTlw73UJwYYogdEZkKJ l6RY+RkxMWXvRQqXJfHIvf7t+gfXYdyhqiNUhb65MztO5JjBM5rI/Xnf7AqBWHU2yOnUZ7gfX90 3UO71KsAR5mLR7TEQb0fG7Wl/A3soaPGFTfQhZWP3KQH0Bof+2de9StC2N7pNmPUV/DkGyRfKWE ouLKSppp9N7C6pZ7tU4w1nsojo/BXizakMnExfW/A/ecH4GwUhb18n/7hD11Glwr45EVBWOliEh ijG0K6Qtwwfo2tpg1qP2Jz/Ua5J50BnKTInaMR+/40fCy7eap+LS4Fv3S3SJaJzgvx25I39AU+B B9bdhpOjd7PrHXVciCkkebCgYr0UAKGOkh64bOLAiinrf0PrztR1o3UgKP7rpSA4wO9PYsbOmkA AG9fI8aMSkNS74lNZuIzb80apVN8uU/NPMqns3qvhVp7lPYa2OVM7oNPpTwESH+vXEqLEZwvz7z 5YZ72ylgl+ttGw7cgWkmY5KH2o2bNX84QCRhJrCkVE2x7qI1UebPR8WcPUoElWIDG6tRlr6o7Zr qZFdoPUY//rxCqg== 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 | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/drivers/mfd/ls2k-bmc-core.c b/drivers/mfd/ls2k-bmc-core.c index 408056bfb2fe757a5bde43775a483a48352e706d..fc9695eedd3662ac92ff116811bb07bff1c994ea 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; - ret = kstrtoint(strsep(&mode, "x"), 10, &pd->width); + ret = kstrtouint(strsep(&mode, "x"), 10, &pd->width); if (ret) - return ret; + goto invalid_mode; - ret = kstrtoint(strsep(&mode, "-"), 10, &pd->height); + if (mode == NULL) { + ret = -EINVAL; + goto invalid_mode; + } + ret = kstrtouint(strsep(&mode, "-"), 10, &pd->height); if (ret) - return ret; + goto invalid_mode; + if (mode == NULL) { + ret = -EINVAL; + goto invalid_mode; + } ret = kstrtoint(strsep(&mode, "@"), 10, &depth); if (ret) - return ret; + 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 ret; } static int ls2k_bmc_probe(struct pci_dev *dev, const struct pci_device_id *id) -- 2.49.0