Received: by 10.213.65.68 with SMTP id h4csp271739imn; Mon, 12 Mar 2018 13:19:27 -0700 (PDT) X-Google-Smtp-Source: AG47ELssUqDO7PxlTb0gwFzOcAQIAIuKdl7y1O6YVrKXdY1cyYU8jBsIo8wcJH32GVJwKpZ1iHiG X-Received: by 2002:a17:902:6041:: with SMTP id a1-v6mr9276382plt.225.1520885967618; Mon, 12 Mar 2018 13:19:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520885967; cv=none; d=google.com; s=arc-20160816; b=AuBAwb9i14mXrPyADlJ8Ye3F8S7dwCpWNHM4vx7moEbUCBsJFOaHDkLYUJ/uzoO22S ODHYKkQtGhtseqojQEMxCEiY/kst16hadtWJ9T+xbsHZV+TwVeyvTqlEC42VVEqoiZnr SAEtnSns5MgAKS7+bzKRfmiCIqS0OykSMIQE2oZvLiGfGGlZWhGTz+qome52xhu0JSEy hC8LQZUeaoZvHBbvKJMaExPvXA4/3qoFIxBS3cMvlyhlF4Kucn37QmrdOPCSkcSUC2j/ MFtIJU8ce0b3mhpic5mVXFAmcGMivku0TCENm+icOnlDMLgLNUOwqJ49HWMO9WRa/y9/ tZ3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=+nX82y6lfJx8w//zXdNIkVm9sqenTvUULbLY7jpq5X0=; b=m+9cc5IJX3j1FAwwdEz3gYtqKFsi47nSkqzlcM9utO9nBX46Fv41neWRFkIn1oLQVM wD4GX2I4S1AedsovD2kuuFFhZmZF09UyRwFk9omRPxttbNWnGt4PZb0MZtMkaBcz+C74 jXSMZeXFGrUDwQ8BImlrF1ZhXYBLcfZGeJMPNTSScvbCdt3lVeipABDgoahgApn0kBJR Pt35u+8mvjZS++Oku9ar3pMFPGnJ402k+2Z07kCUuJ6aeaVHgMT8a6VY5PMkdNszWwqC qNJATwzB/3sRbV53lNHz3LgP10wjTorN+wRZpgNiG+JWYwgw45WosZDugrhm3NbI8oDE v/Qg== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d11-v6si1493169pln.721.2018.03.12.13.19.13; Mon, 12 Mar 2018 13:19:27 -0700 (PDT) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932528AbeCLUQ5 (ORCPT + 99 others); Mon, 12 Mar 2018 16:16:57 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:56220 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932441AbeCLUQK (ORCPT ); Mon, 12 Mar 2018 16:16:10 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 355AA406E8DB; Mon, 12 Mar 2018 20:16:10 +0000 (UTC) Received: from llong.com (dhcp-17-75.bos.redhat.com [10.18.17.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 010891102E22; Mon, 12 Mar 2018 20:16:09 +0000 (UTC) From: Waiman Long To: "Luis R. Rodriguez" , Kees Cook Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Andrew Morton , Al Viro , Matthew Wilcox , Waiman Long Subject: [PATCH v4 6/6] test_sysctl: Add range clamping test Date: Mon, 12 Mar 2018 16:15:44 -0400 Message-Id: <1520885744-1546-7-git-send-email-longman@redhat.com> In-Reply-To: <1520885744-1546-1-git-send-email-longman@redhat.com> References: <1520885744-1546-1-git-send-email-longman@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Mon, 12 Mar 2018 20:16:10 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Mon, 12 Mar 2018 20:16:10 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'longman@redhat.com' RCPT:'' Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a range clamping test for the msgmni sysctl parameter to verify that the input value will be clamped if it exceeds the builtin maximum or minimum value. Below is the expected test run result: Running test: sysctl_test_0006 - run #0 Checking range minimum clamping ... ok Checking range maximum clamping ... ok Signed-off-by: Waiman Long --- tools/testing/selftests/sysctl/sysctl.sh | 43 ++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/tools/testing/selftests/sysctl/sysctl.sh b/tools/testing/selftests/sysctl/sysctl.sh index ec232c3..fbf9d73 100755 --- a/tools/testing/selftests/sysctl/sysctl.sh +++ b/tools/testing/selftests/sysctl/sysctl.sh @@ -34,6 +34,7 @@ ALL_TESTS="$ALL_TESTS 0002:1:1" ALL_TESTS="$ALL_TESTS 0003:1:1" ALL_TESTS="$ALL_TESTS 0004:1:1" ALL_TESTS="$ALL_TESTS 0005:3:1" +ALL_TESTS="$ALL_TESTS 0006:1:1" test_modprobe() { @@ -62,6 +63,9 @@ function allow_user_defaults() if [ -z $WRITES_STRICT ]; then WRITES_STRICT="${PROD_SYSCTL}/kernel/sysctl_writes_strict" fi + if [ -z $MSGMNI ]; then + MSGMNI="${PROD_SYSCTL}/kernel/msgmni" + fi } function check_production_sysctl_writes_strict() @@ -543,6 +547,34 @@ run_stringtests() test_rc } +# TARGET, BEYOND_MIN & BEYOND_MAX need to be defined before running test. +run_range_clamping_test() +{ + echo -n "Checking range minimum clamping ... " + echo $BEYOND_MIN > "$TARGET" > /dev/null 2>&1 + EXITVAL=$? + NEWVAL=$(cat "$TARGET") + if [[ $EXITVAL -ne 0 || $NEWVAL -le $BEYOND_MIN ]]; then + echo "FAIL" >&2 + rc=1 + else + echo "ok" + fi + + echo -n "Checking range maximum clamping ... " + echo $BEYOND_MAX > "$TARGET" > /dev/null 2>&1 + EXITVAL=$? + NEWVAL=$(cat "$TARGET") + if [[ $EXITVAL -ne 0 || $NEWVAL -ge $BEYOND_MAX ]]; then + echo "FAIL" >&2 + rc=1 + else + echo "ok" + fi + + test_rc +} + sysctl_test_0001() { TARGET="${SYSCTL}/int_0001" @@ -600,6 +632,17 @@ sysctl_test_0005() run_limit_digit_int_array } +sysctl_test_0006() +{ + TARGET="${MSGMNI}" + ORIG=$(cat "${TARGET}") + BEYOND_MIN=-1 + BEYOND_MAX=1000000000 + + run_range_clamping_test + set_orig +} + list_tests() { echo "Test ID list:" -- 1.8.3.1