From: Joel Granados <joel.granados@kernel.org>
To: Kees Cook <kees@kernel.org>, Shuah Khan <shuah@kernel.org>,
linux-mm@kvack.org
Cc: Jianlin Shi <shijianlin11@foxmail.com>,
akpm@linux-foundation.org, vbabka@kernel.org,
hannes@cmpxchg.org, surenb@google.com, mhocko@suse.com,
jackmanb@google.com, ziy@nvidia.com,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-kselftest@vger.kernel.org,
Joel Granados <joel.granados@kernel.org>
Subject: [PATCH 4/4] sysctl: Add 0013 to test partially updated vectors
Date: Thu, 13 Aug 2026 14:18:40 +0200 [thread overview]
Message-ID: <20260813-lklm-partial_ctlvec-v1-4-df9e51c13704@kernel.org> (raw)
In-Reply-To: <20260813-lklm-partial_ctlvec-v1-0-df9e51c13704@kernel.org>
Add coverage for partially updated sysctl vectors with test 0013. It
makes sure that the sysctl vector is unchanged when one of the elements
is not valid.
Signed-off-by: Joel Granados <joel.granados@kernel.org>
---
tools/testing/selftests/sysctl/sysctl.sh | 57 ++++++++++++++++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/tools/testing/selftests/sysctl/sysctl.sh b/tools/testing/selftests/sysctl/sysctl.sh
index b2d8bd9026a721e96c26be20069f7f87b06a5cf7..fdf3d2fb0a2ad23a525d3205577a06d7d97576b7 100755
--- a/tools/testing/selftests/sysctl/sysctl.sh
+++ b/tools/testing/selftests/sysctl/sysctl.sh
@@ -4,6 +4,7 @@
# This performs a series tests against the proc sysctl interface.
+# shellcheck disable=SC2317
# Kselftest framework requirement - SKIP code is 4.
ksft_skip=4
@@ -37,6 +38,7 @@ ALL_TESTS="$ALL_TESTS 0009:1:1:unregister_error:0"
ALL_TESTS="$ALL_TESTS 0010:1:1:mnt/mnt_error:0"
ALL_TESTS="$ALL_TESTS 0011:1:1:empty_add:0"
ALL_TESTS="$ALL_TESTS 0012:1:1:u8_valid:0"
+ALL_TESTS="$ALL_TESTS 0013:1:1:int_0003:1"
function allow_user_defaults()
{
@@ -196,6 +198,18 @@ verify_diff_w()
return $?
}
+# Verify that an erroneous ($2) update fails and does not change TARGET
+verify_no_partial_update()
+{
+ TEST_STR="$1"
+ echo -n "$TEST_STR" > "$TARGET"
+
+ if echo -n "$2" > "$TARGET" 2> /dev/null; then
+ return 1
+ fi
+ verify_diff_w "${TARGET}"
+}
+
test_rc()
{
if [[ $rc != 0 ]]; then
@@ -501,6 +515,40 @@ run_limit_digit_int_array()
test_rc
}
+# You used an int array and one of the elements is not acceptable
+run_int_array_no_partial_update()
+{
+ echo -n "Testing invalid array element does not partially update ... "
+ # Expect failure because of 3rd element (abc).
+ if ! verify_no_partial_update "1 2 3 4" "10 20 abc 40"; then
+ echo "FAIL" >&2
+ rc=1
+ else
+ echo "OK"
+ fi
+ test_rc
+
+ echo -n "Testing out of range array element does not partially update ... "
+ # Expect failure because of 3rd element (greater than int)
+ if ! verify_no_partial_update "1 2 3 4" "10 20 $((INT_MAX + 1)) 40"; then
+ echo "FAIL" >&2
+ rc=1
+ else
+ echo "OK"
+ fi
+ test_rc
+
+ echo -n "Testing invalid first array element does not update ... "
+ # Expect failure of 1st element
+ if ! verify_no_partial_update "1 2 3 4" "abc 20 30 40"; then
+ echo "FAIL" >&2
+ rc=1
+ else
+ echo "OK"
+ fi
+ test_rc
+}
+
# You are using an unsigned int
run_limit_digit_uint()
{
@@ -880,6 +928,14 @@ sysctl_test_0012()
return 0
}
+sysctl_test_0013()
+{
+ TARGET="${SYSCTL}/$(get_test_target 0013)"
+ reset_vals
+
+ run_int_array_no_partial_update
+}
+
list_tests()
{
echo "Test ID list:"
@@ -900,6 +956,7 @@ list_tests()
echo "0010 x $(get_test_count 0010) - tests sysct mount point"
echo "0011 x $(get_test_count 0011) - tests empty directories"
echo "0012 x $(get_test_count 0012) - tests range check for u8 proc_handler"
+ echo "0013 x $(get_test_count 0013) - tests partially update vectors on error"
}
usage()
--
2.50.1
prev parent reply other threads:[~2026-08-13 12:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-13 12:18 [PATCH 0/4] sysctl: Disallow partial updates of miss-formatted sysctl vectors Joel Granados
2026-08-13 12:18 ` [PATCH 1/4] sysctl: Split data conversion and file position handling Joel Granados
2026-08-13 12:18 ` [PATCH 2/4] sysctl: Reject uint arrays before calling the general proc_vec Joel Granados
2026-08-13 12:18 ` [PATCH 3/4] sysctl: Disallow partial updates for erroneous sysctl vectors Joel Granados
2026-08-13 12:18 ` Joel Granados [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260813-lklm-partial_ctlvec-v1-4-df9e51c13704@kernel.org \
--to=joel.granados@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=hannes@cmpxchg.org \
--cc=jackmanb@google.com \
--cc=kees@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=shijianlin11@foxmail.com \
--cc=shuah@kernel.org \
--cc=surenb@google.com \
--cc=vbabka@kernel.org \
--cc=ziy@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox