From patchwork Fri May 12 10:30:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xia Fukun X-Patchwork-Id: 93123 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp4999856vqo; Fri, 12 May 2023 03:44:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7unuVGBepMy5jHLp3uCpO5z2LchoNlHSSprulWKx97IU8Nw/ToUJnl9sCMBIxfzIspLaJo X-Received: by 2002:a05:6a00:2e81:b0:63b:7ae0:fde9 with SMTP id fd1-20020a056a002e8100b0063b7ae0fde9mr32665096pfb.20.1683888285687; Fri, 12 May 2023 03:44:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683888285; cv=none; d=google.com; s=arc-20160816; b=kASgf3KD58USOECNrnKks0B+GVJAI2rb8evbjvf27q2s5rZso4knTJkP1w+5FMX32C KSM2GULs60Yqyue8uP/HR36POwKu6nyMB+qXDpl2t0MdIluUCHBvM7XZWzUKnjCTbGAA SHu8AdhhX94jb8U6tqZAUDvgiUV2iME2F2j2Z531FAjDSPhI75w1IQdpujOtYuhVgTHi uwlmS7k0xf9KfbBEGEX5pv5ZAnPxF5E3bAXjGIGa3hY5NIemd/K8mrWre7+GP4CP6Kff yWqsm5fIKp4CY6tCT4uVso1Oglua9cv3Frr2gqeig9Q+ZV5MipbfkpVDzMY7CsJ5qJWn 3Ldw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=a4aBoxgwbAKo23kZoa412KQdakSzcvXBssEauRakokA=; b=xxpj/BBw9ZLKOvSLqFppCZEmyXkI6dG1wIdt7vsE+alaXjYdGKgFcwM/exiefg1Uzm ASwq4WjQWAXp4fVZwxVQo48t+IKOAI84oHBG8BLqIR7n1FmXPzM+3l3AeaJg3kfHuZNM 5ig9l7ij+FTYROmFFRy+LJYBoWgQBEfpQgJx5H48bLEp3BhW6hzWjdnApn3YFqnO6efb ihNj99HPDRzBTOlEOCmoAbfgFO0MFFqT8+RCgUliB/EWCUOZPSZwPaFuH040W8e/Fn37 bbVdGIEaSl9Bh6DvtY01h2kTZEPfoMn4uGtQT+9Ly/9Fwt2irA6IXauv9KHcAJ8B1mgq 0HcA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 14-20020a63184e000000b0052856cec950si8820475pgy.113.2023.05.12.03.44.32; Fri, 12 May 2023 03:44:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240413AbjELKdk (ORCPT + 99 others); Fri, 12 May 2023 06:33:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240641AbjELKcD (ORCPT ); Fri, 12 May 2023 06:32:03 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8FC3D06C for ; Fri, 12 May 2023 03:31:53 -0700 (PDT) Received: from kwepemi500009.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4QHlMF4bbFzqSJm; Fri, 12 May 2023 18:27:37 +0800 (CST) Received: from huawei.com (10.67.175.85) by kwepemi500009.china.huawei.com (7.221.188.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Fri, 12 May 2023 18:31:51 +0800 From: Xia Fukun To: , CC: , Subject: [PATCH v4] kobject: Fix global-out-of-bounds in kobject_action_type() Date: Fri, 12 May 2023 18:30:29 +0800 Message-ID: <20230512103029.183852-1-xiafukun@huawei.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [10.67.175.85] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To kwepemi500009.china.huawei.com (7.221.188.199) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765684842891113403?= X-GMAIL-MSGID: =?utf-8?q?1765684842891113403?= The following c language code can trigger KASAN's global variable out-of-bounds access error in kobject_action_type(): int main() { int fd; char *filename = "/sys/block/ram12/uevent"; char str[86] = "offline"; int len = 86; fd = open(filename, O_WRONLY); if (fd == -1) { printf("open"); exit(1); } if (write(fd, str, len) == -1) { printf("write"); exit(1); } close(fd); return 0; } Function kobject_action_type() receives the input parameters buf and count, where count is the length of the string buf. In the use case we provided, count is 86, the count_first is 85. Buf points to a string with a length of 86, and its first seven characters are "offline". In line 87 of the code, kobject_actions[action] is the string "offline" with the length of 7,an out-of-boundary access will appear: kobject_actions[action][85]. Use sysfs_match_string() to replace the fragile and convoluted loop. This function is well-tested for parsing sysfs inputs. Moreover, this modification will not cause any functional changes. Fixes: f36776fafbaa ("kobject: support passing in variables for synthetic uevents") Signed-off-by: Xia Fukun --- v3 -> v4: - refactor the function to be more obviously correct and readable v2 -> v3: - only declare that it is the latest version of the patch, no change v1 -> v2: - modify the matching logic lib/kobject_uevent.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c index 7c44b7ae4c5c..59f835f5f870 100644 --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c @@ -66,7 +66,7 @@ static int kobject_action_type(const char *buf, size_t count, enum kobject_action action; size_t count_first; const char *args_start; - int ret = -EINVAL; + int i, ret = -EINVAL; if (count && (buf[count-1] == '\n' || buf[count-1] == '\0')) count--; @@ -81,17 +81,20 @@ static int kobject_action_type(const char *buf, size_t count, } else count_first = count; - for (action = 0; action < ARRAY_SIZE(kobject_actions); action++) { - if (strncmp(kobject_actions[action], buf, count_first) != 0) - continue; - if (kobject_actions[action][count_first] != '\0') - continue; - if (args) - *args = args_start; - *type = action; - ret = 0; - break; - } + /* Use sysfs_match_string() to replace the fragile and convoluted loop */ + i = sysfs_match_string(kobject_actions, buf); + + if (i < 0) + return ret; + + action = kobject_action(i); + + if (args) + *args = args_start; + + *type = action; + ret = 0; + out: return ret; }