Patch "selftests: cgroup: Add 'malloc' failures checks in test_memcontrol" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    selftests: cgroup: Add 'malloc' failures checks in test_memcontrol

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     selftests-cgroup-add-malloc-failures-checks-in-test_.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit a8e69c29d1e0bb430dc6e85658adeea8b7d4a526
Author: Ivan Orlov <ivan.orlov0322@xxxxxxxxx>
Date:   Sun Feb 26 16:16:33 2023 +0300

    selftests: cgroup: Add 'malloc' failures checks in test_memcontrol
    
    [ Upstream commit c83f320e55a49abd90629f42a72897afd579e0de ]
    
    There are several 'malloc' calls in test_memcontrol, which can be
    unsuccessful. This patch will add 'malloc' failures checking to
    give more details about test's fail reasons and avoid possible
    undefined behavior during the future null dereference (like the
    one in alloc_anon_50M_check_swap function).
    
    Signed-off-by: Ivan Orlov <ivan.orlov0322@xxxxxxxxx>
    Reviewed-by: Muchun Song <songmuchun@xxxxxxxxxxxxx>
    Acked-by: Shakeel Butt <shakeelb@xxxxxxxxxx>
    Acked-by: Roman Gushchin <roman.gushchin@xxxxxxxxx>
    Signed-off-by: Shuah Khan <skhan@xxxxxxxxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c
index 8833359556f38..fe4f9f4302822 100644
--- a/tools/testing/selftests/cgroup/test_memcontrol.c
+++ b/tools/testing/selftests/cgroup/test_memcontrol.c
@@ -98,6 +98,11 @@ static int alloc_anon_50M_check(const char *cgroup, void *arg)
 	int ret = -1;
 
 	buf = malloc(size);
+	if (buf == NULL) {
+		fprintf(stderr, "malloc() failed\n");
+		return -1;
+	}
+
 	for (ptr = buf; ptr < buf + size; ptr += PAGE_SIZE)
 		*ptr = 0;
 
@@ -211,6 +216,11 @@ static int alloc_anon_noexit(const char *cgroup, void *arg)
 	char *buf, *ptr;
 
 	buf = malloc(size);
+	if (buf == NULL) {
+		fprintf(stderr, "malloc() failed\n");
+		return -1;
+	}
+
 	for (ptr = buf; ptr < buf + size; ptr += PAGE_SIZE)
 		*ptr = 0;
 
@@ -759,6 +769,11 @@ static int alloc_anon_50M_check_swap(const char *cgroup, void *arg)
 	int ret = -1;
 
 	buf = malloc(size);
+	if (buf == NULL) {
+		fprintf(stderr, "malloc() failed\n");
+		return -1;
+	}
+
 	for (ptr = buf; ptr < buf + size; ptr += PAGE_SIZE)
 		*ptr = 0;