Received: by 2002:ac0:da4c:0:0:0:0:0 with SMTP id a12csp834388imi; Fri, 22 Jul 2022 10:25:38 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u426+nsdkOsjg+bBxQMGmrD3BwStN0Yy/nalMuhmGOcGUag9H5ZuE5Xqf2ZXiSSc5nVEM0 X-Received: by 2002:a17:907:7f22:b0:72b:94a2:86b8 with SMTP id qf34-20020a1709077f2200b0072b94a286b8mr748812ejc.236.1658510738261; Fri, 22 Jul 2022 10:25:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658510738; cv=none; d=google.com; s=arc-20160816; b=PyVlAP+bBSWpYZx16ChqyuViLrN1yfjUcQkqe84Rq6L9nKYFbwK8Xsy4TuXSLX6G8D YX7f5QrX5G5Fw3lS6TP3ox9XlkM6R2/RXqzTUFuWrGty0H2VAEOAKUFcGhZ1b9G7wZUY z+g0EPbMrCvgrLtdlFDPBS/7nsxbDO1zADhChzG3/Quyz5A0d4qiGtFS4vSarfeolaiX qt6tkvKG/cIlZCAddTFWlIduD49/3lsz87Oip8Vla/4y91WqokvWiEunmtAdSP/TY8lS 27i8sU6vLKrcjQTD3LudGGNbZXYonOELzkTPzqVeWp8F7fFVMoBIrczP38cbDOeT+tfD nk9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=S5cNbvav8USkmIEO4JyFG7st/81vwwIaAFb/mwn7PBw=; b=TuAQjnhZSXGV2k/heZrozMBfb9BUZzpBuSUApNxOW9OYd3WlSkX88lGc/pVHXLlXwl fvAeNwIgrzfmKkj65MIsIwN8Gc06OPcalqaBr34SHFOxdqEJa2aTGnrQcgoIn3b+YL0Y 61RNjVMUMq+SHPRUJdgJBt3PDwlaiCx0Ss8iIBCmmCWDc4b6NK4mL3qSL+QftB2T92am Zg5k5RswlY9AjDMzDaL7e0OnTumxseOOdPnqxmIfD4bCoSBKkQzdwMIWJ+zTUdC6hiyM hvbDtjP6WUC1Gw2xeGK7ZsPWYw3321qlqzdBkITBNOx58+JCy4Gpe3qqekP1l9pabymA Rbsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="ZijylNG/"; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p29-20020a056402501d00b0043567603f82si898550eda.288.2022.07.22.10.25.13; Fri, 22 Jul 2022 10:25:38 -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=@google.com header.s=20210112 header.b="ZijylNG/"; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235975AbiGVRQE (ORCPT + 99 others); Fri, 22 Jul 2022 13:16:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235893AbiGVRPy (ORCPT ); Fri, 22 Jul 2022 13:15:54 -0400 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3A641E3E2 for ; Fri, 22 Jul 2022 10:15:53 -0700 (PDT) Received: by mail-pj1-x1049.google.com with SMTP id o13-20020a17090ab88d00b001f1ef2109aaso4612680pjr.2 for ; Fri, 22 Jul 2022 10:15:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=S5cNbvav8USkmIEO4JyFG7st/81vwwIaAFb/mwn7PBw=; b=ZijylNG/dIr7hWeGOThw0F1FX6gZqPIINac1RikPNL2Vu4wePiDr7jZuU6qIC5cuaG XNRKI0kBU7C3JPm7J/65+xrByvLzo8y3HdvpHHbqFBzAEfRJE7ZnXXTyRgtjt6cfLkY9 2MsO7lMPJE3fjnRDwsl6JN0jwfY/JMVyASX8WBCPMS/OJlPJFckOgUmN6cJlGGjYrkei 6laVWLPSFcnMjJHQR0Z8ciO2egpgl/YamGSq5ON1PWDG2UVKiYa+aRUx4KAEUdTeFMt8 cGxNS2blvqFhWmOAwIYvNE1soe3QsVF6CH2lupiR2xU1Ap49O7N/Al4TmVzxVXOPpCVr mwMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=S5cNbvav8USkmIEO4JyFG7st/81vwwIaAFb/mwn7PBw=; b=ajGDfHZ1AMn3EWi+f0RHBgY6fDBtBHG8mHOzLXN+0K2XAdRaXvJOpt7Rgc/6O/0rhl ic3Bc3w9SKWGDQowSQweDrScJpObz5nN+Atgj3zCFO6hRxptisg812viXgyNQ+RpvqjW /nVaeVKPM1cjLcsZJUpZRTj6l9oqHG7jm+bzOkcRjzxib8huX553r+j9kvJGTeu+CGsq UpdBYsu0oEmjoeJPZAcqyhmWEuS36EF2+jNko3aC8JXvubd6OZ7qDt9hKcNZ0CL7dnfX e9BSM71ylzVYGRcYe8TxU/WuRvVHTyeU1KqUeq1US0Lj1laRdoXkksGcDjmVOlN1tKU3 NsWA== X-Gm-Message-State: AJIora+z7f94OkOvnfrk7cj/H+MPgsAExUoYRQdwD6Dt5nX5Mn4oad99 thDCL1EX94Ls906dfviZltEiO0cKqZUqFg== X-Received: from dlatypov-spec.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:3f35]) (user=dlatypov job=sendgmr) by 2002:aa7:888a:0:b0:52b:17e8:fd1 with SMTP id z10-20020aa7888a000000b0052b17e80fd1mr785288pfe.46.1658510153314; Fri, 22 Jul 2022 10:15:53 -0700 (PDT) Date: Fri, 22 Jul 2022 17:15:34 +0000 In-Reply-To: <20220722171534.3576419-1-dlatypov@google.com> Message-Id: <20220722171534.3576419-5-dlatypov@google.com> Mime-Version: 1.0 References: <20220722171534.3576419-1-dlatypov@google.com> X-Mailer: git-send-email 2.37.1.359.gd136c6c3e2-goog Subject: [PATCH v2 5/5] kunit: make kunit_kfree(NULL) a no-op to match kfree() From: Daniel Latypov To: brendanhiggins@google.com, davidgow@google.com Cc: linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, skhan@linuxfoundation.org, Daniel Latypov Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL 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 The real kfree() function will silently return when given a NULL. So a user might reasonably think they can write the following code: char *buffer = NULL; if (param->use_buffer) buffer = kunit_kzalloc(test, 10, GFP_KERNEL); ... kunit_kfree(test, buffer); As-is, kunit_kfree() will mark the test as FAILED when buffer is NULL. (And in earlier times, it would segfault). Let's match the semantics of kfree(). Suggested-by: David Gow Signed-off-by: Daniel Latypov --- v1 -> v2: add this patch to the series. --- lib/kunit/test.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/kunit/test.c b/lib/kunit/test.c index c7ca87484968..879c8db36cb5 100644 --- a/lib/kunit/test.c +++ b/lib/kunit/test.c @@ -698,6 +698,9 @@ static inline bool kunit_kfree_match(struct kunit *test, void kunit_kfree(struct kunit *test, const void *ptr) { + if (!ptr) + return; + if (kunit_destroy_resource(test, kunit_kfree_match, (void *)ptr)) KUNIT_FAIL(test, "kunit_kfree: %px already freed or not allocated by kunit", ptr); } -- 2.37.1.359.gd136c6c3e2-goog