From patchwork Mon Oct 24 16:49:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 9923 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp587478wru; Mon, 24 Oct 2022 11:12:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6uyVO793w6JnOXGqk9qxsMYaBUQ1C2Hi0d2hmCnELKc7uTKuWlTGWnX+vV7NOpI9jMWQqT X-Received: by 2002:a17:907:3f27:b0:78d:ad42:f733 with SMTP id hq39-20020a1709073f2700b0078dad42f733mr29510662ejc.320.1666635179203; Mon, 24 Oct 2022 11:12:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666635179; cv=none; d=google.com; s=arc-20160816; b=VKKURCBXZrmK08FQy1ksEJxIiOyaEAz92kNEeXdvSdv9oHRZqUNe/VHxSB00RQNQt4 Z2ae870SNgosCuizmnYvntcsHKdcKil6MPYpNsFvdCr4Lr5a75l3hJT3/9gmEs/WDpji DMIz4eWNv6szkBRqJ9nC97BojsC0b8ojl0BbnPZM5ZCLtvsWeo4ctm+2YvNoOa8TiGKY hyPxanNQV7b+CSUTPlAm0VDLtMVt6nyjzMAZLeNlsvBW4i1zSu+xgR6JxuanfEnDR5I+ +n0sJfVE2Or0zOZvDYY7xYdHMlIlQr4HyrobBE7vg+mXD+FaCgMbjtoeC+I5aMYeGUFM WxSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:from:cc:to:content-language:user-agent :mime-version:date:message-id:dkim-signature; bh=/KDE+ZSByxuwvp2Mh5tqtliS1mJsjNthfkvCjtjqWOc=; b=Ucwk7RiZEfg324w/6UiqnaBDzDm0a9PRxMr1fJ65MYIaVDe25TGmXjIZMqkcXKJ8N/ y2+XDF4Ss9j3vbccAWsjt1gf5Q5ony/LviNVuX74SGfg17Lo6bQpyuWlBeJe6dfuYvJp UbpKESC3YRchjCun34wwlZyS/FPQAIcAFidFWWZz85TpMZtSX5Gpy9Gfdb1HsMWkls+F 2OlrDoLD1LOe90RrethCnumNtBhGLy6iroLwaticbXhQrxWXuWabebfbny+OfwWMIQi3 R7U+C9NiJ4Wuef97/dSfZVgEzZp5IaRoR4S1hju5H3YA59TlVZ6COHUmmVY3CSnrVUXt 81Hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=VR70NOdm; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h17-20020a05640250d100b0045cd10a4c20si513666edb.321.2022.10.24.11.12.32; Mon, 24 Oct 2022 11:12:59 -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=pass header.i=@linuxfoundation.org header.s=google header.b=VR70NOdm; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231172AbiJXSLY (ORCPT + 99 others); Mon, 24 Oct 2022 14:11:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230366AbiJXSLB (ORCPT ); Mon, 24 Oct 2022 14:11:01 -0400 Received: from mail-il1-f178.google.com (mail-il1-f178.google.com [209.85.166.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2583B159D40 for ; Mon, 24 Oct 2022 09:52:35 -0700 (PDT) Received: by mail-il1-f178.google.com with SMTP id 7so2545303ilg.11 for ; Mon, 24 Oct 2022 09:52:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=/KDE+ZSByxuwvp2Mh5tqtliS1mJsjNthfkvCjtjqWOc=; b=VR70NOdmonY9xti+I2mftN/fO5MSCOEqOMQdyXu9zkTVzTpBpjogLNZx8Fpy1CX3WG Xof1GvwLdr9TOIwoFww+uPjBElVHHdeQ5J0KVEFNHf6ieSOglmrnNMK8gRzC1vnES/ki WH8UChPriwQx6YjdhH0x4iNga1Qh55tCl5u1k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/KDE+ZSByxuwvp2Mh5tqtliS1mJsjNthfkvCjtjqWOc=; b=PCiemYcQVWM3Fi0HJGDIQlq3wQGzT5gJdEtP0T3i0rc75VdY/ReiX0UBrU6reVC/es y8G42Ql1qnyKgOMmGorqIzyacprXq8FVCICdFHT7+bWev0wsqnfVI76ncd4WUK4sV+4a xXuLALvhhopexITTDBCrMvmMuGuf6nT0vkcPIIuhkEy7t52sgBYAaCDTJCFCKaetwKAm HkrYtBCuMR9k0uWh0qJQNRFkJVAFTutqgDxvbBqtt0uKM1lGtBYWS6E7gHdj0Z7yKORz jJF2b3yMDs6YxlDyywDHSb0ZOD8gIskCKkU4jEk44qR1hTZ6+O4X7fV60VGK8Xa8UUGD xERw== X-Gm-Message-State: ACrzQf1Csz7mLtlYDGAJ+uEq4Dmw0GMIgMMM3LdG8AaGgXMuNupYeWF/ jwDUhfTLf89jqBrsg3JWhpJW5cjPIlaSMg== X-Received: by 2002:a05:6e02:1aab:b0:2fa:80c2:8375 with SMTP id l11-20020a056e021aab00b002fa80c28375mr21505543ilv.72.1666630149909; Mon, 24 Oct 2022 09:49:09 -0700 (PDT) Received: from [192.168.1.128] ([38.15.45.1]) by smtp.gmail.com with ESMTPSA id h18-20020a056602155200b006bbddd49984sm109429iow.9.2022.10.24.09.49.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 24 Oct 2022 09:49:09 -0700 (PDT) Message-ID: Date: Mon, 24 Oct 2022 10:49:08 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.2.2 Content-Language: en-US To: Linus Torvalds Cc: Brendan Higgins , David Gow , Shuah Khan , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org From: Shuah Khan Subject: [GIT PULL] KUnit fixes update for Linux 6.1-rc3 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS 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?1747593649504364075?= X-GMAIL-MSGID: =?utf-8?q?1747593649504364075?= Hi Linus, Please pull the following KUnit fixes update for Linux 6.1-rc3. This KUnit fixes update for Linux 6.1-rc3 consists of one single fix to update alloc_string_stream() callers to check for IS_ERR() instead of NULL to be in sync with alloc_string_stream() returning IS_ERR(). diff for this pull request is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 9abf2313adc1ca1b6180c508c25f22f9395cc780: Linux 6.1-rc1 (2022-10-16 15:36:24 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-kunit-fixes-6.1-rc3 for you to fetch changes up to 618887768bb71f0a475334fa5a4fba7dc98d7ab5: kunit: update NULL vs IS_ERR() tests (2022-10-18 15:08:42 -0600) ---------------------------------------------------------------- linux-kselftest-kunit-fixes-6.1-rc3 This KUnit fixes update for Linux 6.1-rc3 consists of one single fix to update alloc_string_stream() callers to check for IS_ERR() instead of NULL to be in sync with alloc_string_stream() returning IS_ERR(). ---------------------------------------------------------------- Dan Carpenter (1): kunit: update NULL vs IS_ERR() tests lib/kunit/string-stream.c | 4 ++-- lib/kunit/test.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------- diff --git a/lib/kunit/string-stream.c b/lib/kunit/string-stream.c index f5ae79c37400..a608746020a9 100644 --- a/lib/kunit/string-stream.c +++ b/lib/kunit/string-stream.c @@ -56,8 +56,8 @@ int string_stream_vadd(struct string_stream *stream, frag_container = alloc_string_stream_fragment(stream->test, len, stream->gfp); - if (!frag_container) - return -ENOMEM; + if (IS_ERR(frag_container)) + return PTR_ERR(frag_container); len = vsnprintf(frag_container->fragment, len, fmt, args); spin_lock(&stream->lock); diff --git a/lib/kunit/test.c b/lib/kunit/test.c index 90640a43cf62..2a6992fe7c3e 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -265,7 +265,7 @@ static void kunit_fail(struct kunit *test, const struct kunit_loc *loc, kunit_set_failure(test); stream = alloc_string_stream(test, GFP_KERNEL); - if (!stream) { + if (IS_ERR(stream)) { WARN(true, "Could not allocate stream to print failed assertion in %s:%d\n", loc->file,