From patchwork Fri Aug 4 17:05:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mirsad Todorovac X-Patchwork-Id: 131287 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp9851vqr; Fri, 4 Aug 2023 11:01:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGn6mH9HqxQsuQmUcj8W94gieWZgYH+d3Mi2SOCr7ncAcJsWYwfV6SEkHZQKX+NVmTquKVv X-Received: by 2002:a17:907:2cce:b0:99c:6312:73ca with SMTP id hg14-20020a1709072cce00b0099c631273camr1829153ejc.71.1691172105726; Fri, 04 Aug 2023 11:01:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691172105; cv=none; d=google.com; s=arc-20160816; b=GzjEUrrGGdZFILBmYF3QnJzIkZ6byhjvzwAK/qq+GbNNKH1pIH0Ef2AK2yXF6MJbBD j6zI+MNsIhXqpR58akDuRLkhwu4FsThNqfHFocW2yZZDlN8FGTt+dPVO9JYXcPEzEi/1 5QqdtWiBxZG60gOLJPVrzekS+cYoK9t7fkQV/rLutfKLBa+0Db7aMtH4Iu53HqqAWlh1 Io4r4LXR50Q0YHazMqZWdRifuIK70HlgDzJUTaNeoUIr+dl429Ldt8hssBO9dZf6zVWe q+C3OaWxDsLPeXUjDo9nl1vwBJRQVBgVYNbun+nBvVyJLvpXPQHCfPuNFTiqapM2kuCF W8Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature:dkim-signature; bh=iz5dO8ZJGmUBT4jVj4H9eHawNutPkmin07M28QPMmOo=; fh=fM3PyGUzUr+0+zYckifi/gEhAEC/t685IhqUzsZ1I2A=; b=IRDuoFg2kKibSk8GXbQndvVKOkAgGlWv2/dsR8taD5XTUR8VO3sbT/nVPc9KMl9Tkd 8JP3i86G8YM9XSczcDYJOBlJGatvkcOFUQzpgJh/tBQmxlX1Pw0B+HSHXx8pwQ76/h7n Rq/c8NxCp5mngasGTfPkjqqu8vE1H4hSbffXZ+sj2fAwphmyuDievONhbJdmVTufhoWb 2lp09fdy4UFve4JAxe2+CvjnOD6pcCEVW5fW6ZKqGK/5V8zGsmy3P64B7SfOLbyGifix irqQYxJNihsWnGaIdV0coGkWg/rglz6bSQ7z6OOrMHwLTWXyOPtmbT0q67ycLv6P/Sf4 mFPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=19VoSiUA; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=yiLAlM26; 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=NONE sp=NONE dis=NONE) header.from=alu.unizg.hr Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u4-20020a170906654400b0096fe1a56de3si560743ejn.1048.2023.08.04.11.00.56; Fri, 04 Aug 2023 11:01: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; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=19VoSiUA; dkim=fail header.i=@alu.unizg.hr header.s=mail header.b=yiLAlM26; 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=NONE sp=NONE dis=NONE) header.from=alu.unizg.hr Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231802AbjHDRHc (ORCPT + 99 others); Fri, 4 Aug 2023 13:07:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230526AbjHDRHa (ORCPT ); Fri, 4 Aug 2023 13:07:30 -0400 Received: from domac.alu.hr (domac.alu.unizg.hr [IPv6:2001:b68:2:2800::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAC86469A; Fri, 4 Aug 2023 10:07:16 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by domac.alu.hr (Postfix) with ESMTP id 490EE60177; Fri, 4 Aug 2023 19:07:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1691168835; bh=JumSvu3iT0+NxH9SPTG0Zvsq/MzGUE4lhaT/ijlPQ/I=; h=From:To:Cc:Subject:Date:From; b=19VoSiUA45WPIud1c8O95Oov0OPUiMu8xH4iS3u8WcjA7BPaJtdth1CYPsJweVpXA bWnyf/V4BwznJLuBJMPi2gNxtNQZu7i+jxu6uL/iqO3BECYLj+QSTewbcKe/MYODdu 3kqNMar0QDDymAD0bSRkvH7vcCyJsegX312HvQzpD0gMeSlPg4AkBO4M9t2UFfIcWd rejV0HI0PUpuw8wvLAQyIfAZaoSNX/kAa+JJAsg531xXTuk9y6Vbxiwun5zBUuX/+X 05CZfcQy4pk6o95Nso9jshNgUJbCGgV0jw30JB2hq/KAPcMg3WaslzGzJ9nL/zxDhP 47PoVoZN6nyeQ== X-Virus-Scanned: Debian amavisd-new at domac.alu.hr Received: from domac.alu.hr ([127.0.0.1]) by localhost (domac.alu.hr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JBuLlGB_YCx6; Fri, 4 Aug 2023 19:07:12 +0200 (CEST) Received: from defiant.. (unknown [94.250.191.183]) by domac.alu.hr (Postfix) with ESMTPSA id 603A960174; Fri, 4 Aug 2023 19:06:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=alu.unizg.hr; s=mail; t=1691168832; bh=JumSvu3iT0+NxH9SPTG0Zvsq/MzGUE4lhaT/ijlPQ/I=; h=From:To:Cc:Subject:Date:From; b=yiLAlM26aqn9NxLeLdglwXGqAGPLXEyo7yuwWW0IG+hfrEq2M/4KoZvyOqhEB+Ss1 TOVau3/Tx5VCfCEdCmeDd9jzAvfLUZgVKGLDiBJTzuNmd2pPTisR12km5QdXg+rjI2 XCoJ0D4kt0Qzqmlw0FYNzE3QPbbTwF0NZd0x/woGIq6IZsr9I7wbryZ8zWy7n6tEaF BYzOjBfKT9rU4MFlAlIdN3+GSCa57CvNiekp0YHE8goOfhw7GfAaY1ERNCBCwTT8XE PHywhTWzD+k3hACKQ9yo1Jmr4uxwunaahZN+DWC6ZLACcJExNeev3ojJvayVgEu7qx rW4N30o2YVMzA== From: Mirsad Todorovac To: Greg Kroah-Hartman , Mirsad Todorovac , linux-kernel@vger.kernel.org Cc: "Luis R . Rodriguez" , Russ Weight , Takashi Iwai , Tianfei Zhang , Shuah Khan , Colin Ian King , Randy Dunlap , linux-kselftest@vger.kernel.org, stable@vger.kernel.org, Dan Carpenter Subject: [PATCH v4 5.4 1/2] test_firmware: prevent race conditions by a correct implementation of locking Date: Fri, 4 Aug 2023 19:05:28 +0200 Message-Id: <20230804170528.93028-1-mirsad.todorovac@alu.unizg.hr> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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: INBOX X-GMAIL-THRID: 1773322481652459136 X-GMAIL-MSGID: 1773322481652459136 [ Upstream commit 4acfe3dfde685a5a9eaec5555351918e2d7266a1 ] Dan Carpenter spotted a race condition in a couple of situations like these in the test_firmware driver: static int test_dev_config_update_u8(const char *buf, size_t size, u8 *cfg) { u8 val; int ret; ret = kstrtou8(buf, 10, &val); if (ret) return ret; mutex_lock(&test_fw_mutex); *(u8 *)cfg = val; mutex_unlock(&test_fw_mutex); /* Always return full write size even if we didn't consume all */ return size; } static ssize_t config_num_requests_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { int rc; mutex_lock(&test_fw_mutex); if (test_fw_config->reqs) { pr_err("Must call release_all_firmware prior to changing config\n"); rc = -EINVAL; mutex_unlock(&test_fw_mutex); goto out; } mutex_unlock(&test_fw_mutex); // NOTE: HERE is the race!!! Function can be preempted! // test_fw_config->reqs can change between the release of // the lock about and acquire of the lock in the // test_dev_config_update_u8() rc = test_dev_config_update_u8(buf, count, &test_fw_config->num_requests); out: return rc; } static ssize_t config_read_fw_idx_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { return test_dev_config_update_u8(buf, count, &test_fw_config->read_fw_idx); } The function test_dev_config_update_u8() is called from both the locked and the unlocked context, function config_num_requests_store() and config_read_fw_idx_store() which can both be called asynchronously as they are driver's methods, while test_dev_config_update_u8() and siblings change their argument pointed to by u8 *cfg or similar pointer. To avoid deadlock on test_fw_mutex, the lock is dropped before calling test_dev_config_update_u8() and re-acquired within test_dev_config_update_u8() itself, but alas this creates a race condition. Having two locks wouldn't assure a race-proof mutual exclusion. This situation is best avoided by the introduction of a new, unlocked function __test_dev_config_update_u8() which can be called from the locked context and reducing test_dev_config_update_u8() to: static int test_dev_config_update_u8(const char *buf, size_t size, u8 *cfg) { int ret; mutex_lock(&test_fw_mutex); ret = __test_dev_config_update_u8(buf, size, cfg); mutex_unlock(&test_fw_mutex); return ret; } doing the locking and calling the unlocked primitive, which enables both locked and unlocked versions without duplication of code. Fixes: c92316bf8e948 ("test_firmware: add batched firmware tests") Cc: Luis R. Rodriguez Cc: Greg Kroah-Hartman Cc: Russ Weight Cc: Takashi Iwai Cc: Tianfei Zhang Cc: Shuah Khan Cc: Colin Ian King Cc: Randy Dunlap Cc: linux-kselftest@vger.kernel.org Cc: stable@vger.kernel.org # v5.4, 4.19, 4.14 Suggested-by: Dan Carpenter Link: https://lore.kernel.org/r/20230509084746.48259-1-mirsad.todorovac@alu.unizg.hr Signed-off-by: Mirsad Todorovac [ This is the patch to fix the racing condition in locking for the 5.4, ] [ 4.19 and 4.14 stable branches. Not all the fixes from the upstream ] [ commit apply, but those which do are verbatim equal to those in the ] [ upstream commit. ] --- v4: minor versioning clarifications for the patchwork. no changes to the commit. v3: fixed a minor typo. no change to commit. v2: tested on 5.4 stable build. lib/test_firmware.c | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/lib/test_firmware.c b/lib/test_firmware.c index 38553944e967..92d7195d5b5b 100644 --- a/lib/test_firmware.c +++ b/lib/test_firmware.c @@ -301,16 +301,26 @@ static ssize_t config_test_show_str(char *dst, return len; } -static int test_dev_config_update_bool(const char *buf, size_t size, - bool *cfg) +static inline int __test_dev_config_update_bool(const char *buf, size_t size, + bool *cfg) { int ret; - mutex_lock(&test_fw_mutex); if (strtobool(buf, cfg) < 0) ret = -EINVAL; else ret = size; + + return ret; +} + +static int test_dev_config_update_bool(const char *buf, size_t size, + bool *cfg) +{ + int ret; + + mutex_lock(&test_fw_mutex); + ret = __test_dev_config_update_bool(buf, size, cfg); mutex_unlock(&test_fw_mutex); return ret; @@ -340,7 +350,7 @@ static ssize_t test_dev_config_show_int(char *buf, int cfg) return snprintf(buf, PAGE_SIZE, "%d\n", val); } -static int test_dev_config_update_u8(const char *buf, size_t size, u8 *cfg) +static inline int __test_dev_config_update_u8(const char *buf, size_t size, u8 *cfg) { int ret; long new; @@ -352,14 +362,23 @@ static int test_dev_config_update_u8(const char *buf, size_t size, u8 *cfg) if (new > U8_MAX) return -EINVAL; - mutex_lock(&test_fw_mutex); *(u8 *)cfg = new; - mutex_unlock(&test_fw_mutex); /* Always return full write size even if we didn't consume all */ return size; } +static int test_dev_config_update_u8(const char *buf, size_t size, u8 *cfg) +{ + int ret; + + mutex_lock(&test_fw_mutex); + ret = __test_dev_config_update_u8(buf, size, cfg); + mutex_unlock(&test_fw_mutex); + + return ret; +} + static ssize_t test_dev_config_show_u8(char *buf, u8 cfg) { u8 val; @@ -392,10 +411,10 @@ static ssize_t config_num_requests_store(struct device *dev, mutex_unlock(&test_fw_mutex); goto out; } - mutex_unlock(&test_fw_mutex); - rc = test_dev_config_update_u8(buf, count, - &test_fw_config->num_requests); + rc = __test_dev_config_update_u8(buf, count, + &test_fw_config->num_requests); + mutex_unlock(&test_fw_mutex); out: return rc;