From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=MAILING_LIST_MULTI,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A890DC433F5 for ; Fri, 7 Sep 2018 17:06:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5CAA12075E for ; Fri, 7 Sep 2018 17:06:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5CAA12075E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726763AbeIGVsl (ORCPT ); Fri, 7 Sep 2018 17:48:41 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:52350 "EHLO mailout.easymail.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725963AbeIGVsl (ORCPT ); Fri, 7 Sep 2018 17:48:41 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 856CAC083E; Fri, 7 Sep 2018 17:06:49 +0000 (UTC) Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo01-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id r7GgfzySB-I9; Fri, 7 Sep 2018 17:06:49 +0000 (UTC) Received: from [192.168.1.87] (c-24-9-64-241.hsd1.co.comcast.net [24.9.64.241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 9EF38C108F; Fri, 7 Sep 2018 17:06:37 +0000 (UTC) Subject: Re: [PATCH 1/2] Fix cg_read_strcmp() To: jgkamat@fb.com Cc: linux-kselftest@vger.kernel.org, Roman Gushchin , Tejun Heo , kernel-team@fb.com, linux-kernel@vger.kernel.org, jaygkamat@gmail.com, Shuah Khan References: <20180905010827.27743-1-jgkamat@fb.com> <20180907164924.13789-1-jgkamat@fb.com> <20180907164924.13789-2-jgkamat@fb.com> From: Shuah Khan Message-ID: Date: Fri, 7 Sep 2018 11:06:36 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20180907164924.13789-2-jgkamat@fb.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/07/2018 10:49 AM, jgkamat@fb.com wrote: > From: Jay Kamat > > Fix a couple issues with cg_read_strcmp(), to improve correctness of > cgroup tests > - Fix cg_read_strcmp() always returning 0 for empty "needle" strings > - Fix a memory leak in cg_read_strcmp() > > Fixes: 84092dbcf901 ("selftests: cgroup: add memory controller self-tests") > > Signed-off-by: Jay Kamat > --- > tools/testing/selftests/cgroup/cgroup_util.c | 17 ++++++++++++++--- > 1 file changed, 14 insertions(+), 3 deletions(-) > > diff --git a/tools/testing/selftests/cgroup/cgroup_util.c b/tools/testing/selftests/cgroup/cgroup_util.c > index 1e9e3c470561..8b644ea39725 100644 > --- a/tools/testing/selftests/cgroup/cgroup_util.c > +++ b/tools/testing/selftests/cgroup/cgroup_util.c > @@ -89,17 +89,28 @@ int cg_read(const char *cgroup, const char *control, char *buf, size_t len) > int cg_read_strcmp(const char *cgroup, const char *control, > const char *expected) > { > - size_t size = strlen(expected) + 1; > + size_t size; > char *buf; > + int ret; > + > + /* Handle the case of comparing against empty string */ > + if (!expected) > + size = 32; This doesn't look right. I would think expected shouldn't be null? It gets used below. > + else > + size = strlen(expected) + 1; > > buf = malloc(size); > if (!buf) > return -1; > > - if (cg_read(cgroup, control, buf, size)) > + if (cg_read(cgroup, control, buf, size)) { > + free(buf); > return -1; > + } > > - return strcmp(expected, buf); > + ret = strcmp(expected, buf); If expected is null, what's the point in running the test? Is empty "needle" string a valid test scenario? > + free(buf); > + return ret; > } > > int cg_read_strstr(const char *cgroup, const char *control, const char *needle) > thanks, -- Shuah