From patchwork Mon Oct 30 10:47:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Fitzgerald X-Patchwork-Id: 159685 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp2114137vqb; Mon, 30 Oct 2023 03:48:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHcfmpRtD2qkIt1CRujLyqUUC9DYOrgtbZcJ8t6sLz7C2PoJeTd/Vvy8gz97kXTmjCDajnS X-Received: by 2002:a05:6871:3418:b0:1d5:21cd:7069 with SMTP id nh24-20020a056871341800b001d521cd7069mr12395649oac.8.1698662891411; Mon, 30 Oct 2023 03:48:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698662891; cv=none; d=google.com; s=arc-20160816; b=KPwP9ZZPC97Ra793SKGSpjvvxrAL36NWLebN5MP8CTh9jSHPt1Dupa+C2/AoyxpCim i1bzb0gFE/9Xvx7AWGAG7GaIj0hgI469mosH+grhPD+jKV+EC3QLdPhNe/rGU4soQrYj QNc+10GRVHizvi8IJO8zSUfnjo9vaDupJvsqzpyV7WG9ga7W5yqHt5hvKkme7/9r1AL0 k/7xVAb6xmmxPkTaSGcXd+l+FYubE9/v4FS6LvJLW78IwRD543MvKrb2Swxqa+TiaPMt XFfYBkeUWBNfyJngmkoS/D8evnJvuJzD3mjcTCu4hMkdUz+FoEwLfIC/v9SZxgzSgg3u X5YQ== 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; bh=9sJHJNvpeHCSQtuFmI1rXyyT6mj/StcEuPaBnCXdF3I=; fh=jtkMVljxaSSnm+wRWxFZHf/UR4p8LFQ8rZaEaUeBMWE=; b=h6+wx4Snwi+TIWireW2QGGHSYDUGz4tKYSnpElzex92+pZJ9XHgbHaAXWBQUzMomy+ I14KeVip1u6D60Gow4+FjQV15NL2mZSCK+jFCjffZF4xXPfqyNibPsirxy90lHXNLw1k FQZx+QflwHBtFa+FTVmRoVEy07wCmX4uVlI4Co81W9/tGhtWDgZ6aoggVZdMirIf5x5x osRyj7VdNIPW1SRJf04hvbfjUsGxjG9Q+TCO0qWtUYRArAyhgikncAq9MQI6wweU9BIy Sk+z6ZxCbZ5Pzjmb5gIPMt6Ffls8f/N1cZgJBRlesDpcRUyJAHb0BOPu9zCj1Ch78JIr XdYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=Eawuq+41; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id u4-20020a637904000000b005ac13df150dsi3437213pgc.384.2023.10.30.03.48.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 03:48:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=Eawuq+41; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 88B388031B1B; Mon, 30 Oct 2023 03:48:10 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232531AbjJ3KsF (ORCPT + 31 others); Mon, 30 Oct 2023 06:48:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232492AbjJ3KsD (ORCPT ); Mon, 30 Oct 2023 06:48:03 -0400 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9211E9; Mon, 30 Oct 2023 03:47:57 -0700 (PDT) Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 39U5v5tC004206; Mon, 30 Oct 2023 05:47:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding:content-type; s=PODMain02222019; bh=9 sJHJNvpeHCSQtuFmI1rXyyT6mj/StcEuPaBnCXdF3I=; b=Eawuq+41XtUvpyLDB GocuVetWVTaIapFYEHTYC89ueUP3CLf1mCwBuzwtfyEdPwvgM2yFqekTHztxy3iN X2SvFrtV0StqrfpNiu1256DPK1LlrLC6ybxoVmnzUji6o12LCnj3HMeDTAczgDir LBc0T6sZTD7R8ejwKGZBwqEmTZJJP91fCcphiBwc1uDNrsMjzvB2c+GZz+l3/HVb Uya46OMf3oqMUh10eg/92/PgrfyJdUdTx9PX4TQbZlS34/OL8W8cfjtTwazQe2RS HyNFDfjS06YMDdQ7leptlR44E/hiJThwMcSSLQKJTE45DpnhGMWaljfK+SLd/5Ka z4jEA== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3u0xqhk04v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 30 Oct 2023 05:47:47 -0500 (CDT) Received: from ediex02.ad.cirrus.com (198.61.84.81) by ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39; Mon, 30 Oct 2023 10:47:46 +0000 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by anon-ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server id 15.2.1118.39 via Frontend Transport; Mon, 30 Oct 2023 10:47:46 +0000 Received: from edi-sw-dsktp-006.ad.cirrus.com (edi-sw-dsktp-006.ad.cirrus.com [198.90.251.82]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 09CBD11AB; Mon, 30 Oct 2023 10:47:46 +0000 (UTC) From: Richard Fitzgerald To: , , CC: , , , , "Richard Fitzgerald" Subject: [PATCH RESEND] kunit: string-stream: Allow ERR_PTR to be passed to string_stream_destroy() Date: Mon, 30 Oct 2023 10:47:46 +0000 Message-ID: <20231030104746.241414-1-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: RMOWkfwHyhs4BOM_r5Gq0jWBQkyDCvTn X-Proofpoint-GUID: RMOWkfwHyhs4BOM_r5Gq0jWBQkyDCvTn X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 30 Oct 2023 03:48:10 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781177140092282846 X-GMAIL-MSGID: 1781177140092282846 Check the stream pointer passed to string_stream_destroy() for IS_ERR_OR_NULL() instead of only NULL. Whatever alloc_string_stream() returns should be safe to pass to string_stream_destroy(), and that will be an ERR_PTR. It's obviously good practise and generally helpful to also check for NULL pointers so that client cleanup code can call string_stream_destroy() unconditionally - which could include pointers that have never been set to anything and so are NULL. Signed-off-by: Richard Fitzgerald Reviewed-by: Rae Moar Reviewed-by: David Gow --- lib/kunit/string-stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/kunit/string-stream.c b/lib/kunit/string-stream.c index a6f3616c2048..54f4fdcbfac8 100644 --- a/lib/kunit/string-stream.c +++ b/lib/kunit/string-stream.c @@ -173,7 +173,7 @@ void string_stream_destroy(struct string_stream *stream) { KUNIT_STATIC_STUB_REDIRECT(string_stream_destroy, stream); - if (!stream) + if (IS_ERR_OR_NULL(stream)) return; string_stream_clear(stream);