Received: by 2002:a25:31c3:0:0:0:0:0 with SMTP id x186csp1452659ybx; Tue, 5 Nov 2019 16:38:43 -0800 (PST) X-Google-Smtp-Source: APXvYqzbUKwqQDhvNdaHyviVaK3//+ftykBHy2j3upvPM/Ti42MjLhbjf21dcY1oR+OQvjC+bLXd X-Received: by 2002:a17:906:8141:: with SMTP id z1mr33031149ejw.128.1573000723251; Tue, 05 Nov 2019 16:38:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573000723; cv=none; d=google.com; s=arc-20160816; b=M1JMzjl0RGWs+oclKXKkZok0sk0fRrcBrpYgStGrse7VIeeqOpQGC3fudcPu+vG2xF Ns+MH9i0mxPJQuvt7WMZXnFqM61cVmUJWMU3w10U5WcQaEfjM2G+5DF1PCHVA02JmAAw tjfIFd/PtokRbGnvv2pWluH1BSpf/cW/aO6OobrFzjhdSvB0psHy7Fc3Oj3cVm8jq2zc lWc/Tt0qGI3pMcyHQ0YPDM2RGxCjqTRW0ZMUKT2YDcdBwkEnXaWcTp4oiCBjsC0GtmcZ tePeghGahbvdo2Ib+Vo5QfccZU6ar7Kz3ZmgA589IeNYwNxMedtKLA0Sp3vV2oFA0oaV vqUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=+xOEbfGEe8GuKsDuMH9MLXg4toOcxPN6sItuj2bk3/c=; b=qbXcZ+1uICQZibMe8iEFYD3sI29uaSUaanQiTjBDefv4HKwAXoJRfxDYsi7AS7tvYE xw4T8rv7qIPRDCpK11cYn5LaVx74L0nU/CvYKJ7UHNvimsx/gTaGBVsvXX3gfQbbRnwG 17S0Q1cJK7NRZ4kVADCQiqI9HuPtBZslkTkMOLJAxnn8yF5Jx9tLlnpevt0opN/fVyRc 3RdleKDCuqXym8Co6Nf/O6z4m7UL4VjPUDNY16fOYOHhyn6hcWXOzhCuAjcFyT4i172C xQA2GrZq3BdxDWRqkc2QXs02krn/zqK8gd8CWWUZ25GNIoo5WfXZGprRig0o6oEgTNgQ MwPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=H9CHqqLs; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k19si11096199ede.293.2019.11.05.16.38.19; Tue, 05 Nov 2019 16:38:43 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=H9CHqqLs; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S1730579AbfKFAh3 (ORCPT + 99 others); Tue, 5 Nov 2019 19:37:29 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:43758 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727046AbfKFAh3 (ORCPT ); Tue, 5 Nov 2019 19:37:29 -0500 Received: by mail-pf1-f195.google.com with SMTP id 3so17422576pfb.10 for ; Tue, 05 Nov 2019 16:37:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=+xOEbfGEe8GuKsDuMH9MLXg4toOcxPN6sItuj2bk3/c=; b=H9CHqqLsNjXKwjTR8C18iAyH8mYJcqKTJzTxrYbrX9XeucuHFy1MhMkr1qLwUynZoI /J/8lr1Tt6Tc60wRlH3f0rCQ+RCSquDh718fEM32Pnwo3rLKeuHLnu9yJmM44VRCWzAL fq9Bt+WdnoeV5CUpdKzZdWbZmt41FnpeY8GYZ5DJ2H/cxEiSxhW2f46kx44APEOsPs2N 4F351UJo2YxVOgozWPeqoavVc5HMRYeB51yXeKoXhAF9CtkVszv/lcexWJwkh/wJIpcR 4dIAA7zDub0oVR8BKH2l7GEwSt6EPBaBMMM13ETRjrqv2629QX/kFGMEOst2UaazKjlf E0Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=+xOEbfGEe8GuKsDuMH9MLXg4toOcxPN6sItuj2bk3/c=; b=LioZQT1mkTakWdyVxqPzq/GwBF9yngsybV1nE3Vhc+1hi3DDKDsX7rVprfy5Nd5GIu Eo7oelYZHhWZDWUwybt2/5fXO3rhtE58I0yk1A9yZ+YUMgh+9MSL5/9FIl5L+mCBGozi iEfegazYfE0UByYqzYYC2LtQ8XSG3oMn00MkBbbk70i20XVMgfPioKuIs76xmt3FGhlX vjO8KiDxcF+9P1FOav0o53ftdltI+ye3SFnVef4GoIHQTcFToAE4eg+OpKiGl248KMJE SWDuLX//uMw3+A5DSlDlOcz1GoBvpn0pozyrbyse8BftrblPDULLYuH75UOI+suNA5cD WxbA== X-Gm-Message-State: APjAAAVkbaPaqI6lSEREvSCMY22r1WZw+ZBP88Uk73+7ED6fqgGiTTqX kSImOOaJeZf7QYB/Sk2aasUcTA1HP3cQ33oLgPKmbQ== X-Received: by 2002:a17:90a:252d:: with SMTP id j42mr18353pje.131.1573000647922; Tue, 05 Nov 2019 16:37:27 -0800 (PST) MIME-Version: 1.0 References: <20191018001816.94460-1-brendanhiggins@google.com> <201910301157.58D0CE4D3@keescook> In-Reply-To: From: Brendan Higgins Date: Tue, 5 Nov 2019 16:37:16 -0800 Message-ID: Subject: Re: [PATCH linux-kselftest/test v1] apparmor: add AppArmor KUnit tests for policy unpack To: Kees Cook Cc: Iurii Zaikin , shuah , John Johansen , jmorris@namei.org, serge@hallyn.com, Alan Maguire , David Gow , Luis Chamberlain , "Theodore Ts'o" , Linux Kernel Mailing List , linux-security-module@vger.kernel.org, KUnit Development , "open list:KERNEL SELFTEST FRAMEWORK" , Mike Salvatore Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Nov 5, 2019 at 4:35 PM Brendan Higgins wrote: > > On Wed, Oct 30, 2019 at 11:59 AM Kees Cook wrote: > > > > On Thu, Oct 17, 2019 at 05:33:56PM -0700, Iurii Zaikin wrote: > > > On Thu, Oct 17, 2019 at 5:19 PM Brendan Higgins > > > wrote: > > > > > > > +config SECURITY_APPARMOR_TEST > > > > + bool "Build KUnit tests for policy_unpack.c" > > > > + default n > > > > New options already already default n, this can be left off. > > > > > > + depends on KUNIT && SECURITY_APPARMOR > > > > + help > > > > > > > select SECURITY_APPARMOR ? > > > > "select" doesn't enforce dependencies, so just a "depends ..." is > > correct. > > > > > > + KUNIT_EXPECT_EQ(test, size, TEST_BLOB_DATA_SIZE); > > > > + KUNIT_EXPECT_TRUE(test, > > > > + memcmp(blob, TEST_BLOB_DATA, TEST_BLOB_DATA_SIZE) == 0); > > > I think this must be KUNIT_ASSERT_EQ(test, size, TEST_BLOB_DATA_SIZE);, > > > otherwise there could be a buffer overflow in memcmp. All tests that > > > follow such pattern > > > > Agreed. > > > > > are suspect. Also, not sure about your stylistic preference for > > > KUNIT_EXPECT_TRUE(test, > > > memcmp(blob, TEST_BLOB_DATA, TEST_BLOB_DATA_SIZE) == 0); > > > vs > > > KUNIT_EXPECT_EQ(test, > > > 0, > > > memcmp(blob, TEST_BLOB_DATA, TEST_BLOB_DATA_SIZE)); > > > > I like == 0. > > Oh, I almost missed this. I think the *_EQ(...) is better than the > *_TRUE(...) because the EQ is able to provide more debug information > if the test fails (otherwise there would really be no point in > providing all these variants). > > Any objections? > > Thanks for the catch Iurii! Wait, nevermind. Either way is fine because memcmp probably won't show terribly interesting information in the non-zero case. I'll just leave it the way Mike wrote it. Sorry!