* [PATCH] selftests/ring-buffer: Add test for out-of-bound pgoff mapping
@ 2024-12-18 17:03 Vincent Donnefort
2024-12-24 3:05 ` Steven Rostedt
0 siblings, 1 reply; 3+ messages in thread
From: Vincent Donnefort @ 2024-12-18 17:03 UTC (permalink / raw)
To: rostedt
Cc: mhiramat, linux-kernel, linux-trace-kernel, kernel-team,
aha310510, eadavis, Vincent Donnefort, Shuah Khan,
linux-kselftest
Extend the ring-buffer mapping test coverage by checking an out-of-bound
pgoff which has proven to be problematic in the past.
Cc: Shuah Khan <skhan@linuxfoundation.org>
Cc: linux-kselftest@vger.kernel.org
Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
diff --git a/tools/testing/selftests/ring-buffer/map_test.c b/tools/testing/selftests/ring-buffer/map_test.c
index d10a847130fb..a58f520f2f41 100644
--- a/tools/testing/selftests/ring-buffer/map_test.c
+++ b/tools/testing/selftests/ring-buffer/map_test.c
@@ -233,12 +233,18 @@ TEST_F(map, data_mmap)
ASSERT_NE(data, MAP_FAILED);
munmap(data, data_len);
- /* Overflow the available subbufs by 1 */
+ /* Offset within ring-buffer bounds, mapping size overflow */
meta_len += desc->meta->subbuf_size * 2;
data = mmap(NULL, data_len, PROT_READ, MAP_SHARED,
desc->cpu_fd, meta_len);
ASSERT_EQ(data, MAP_FAILED);
+ /* Offset outside ring-buffer bounds */
+ data_len = desc->meta->subbuf_size * desc->meta->nr_subbufs;
+ data = mmap(NULL, data_len, PROT_READ, MAP_SHARED,
+ desc->cpu_fd, data_len + (desc->meta->subbuf_size * 2));
+ ASSERT_EQ(data, MAP_FAILED);
+
/* Verify meta-page padding */
if (desc->meta->meta_page_size > getpagesize()) {
data_len = desc->meta->meta_page_size;
base-commit: 61baee2dc5341c936e7fa7b1ca33c5607868de69
--
2.47.1.613.gc27f4b7a9f-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] selftests/ring-buffer: Add test for out-of-bound pgoff mapping
2024-12-18 17:03 [PATCH] selftests/ring-buffer: Add test for out-of-bound pgoff mapping Vincent Donnefort
@ 2024-12-24 3:05 ` Steven Rostedt
2025-01-02 21:19 ` Shuah Khan
0 siblings, 1 reply; 3+ messages in thread
From: Steven Rostedt @ 2024-12-24 3:05 UTC (permalink / raw)
To: Shuah Khan
Cc: Vincent Donnefort, mhiramat, linux-kernel, linux-trace-kernel,
kernel-team, aha310510, eadavis, linux-kselftest
Hi Shuah,
Care to take this through your tree?
On Wed, 18 Dec 2024 17:03:18 +0000
Vincent Donnefort <vdonnefort@google.com> wrote:
> Extend the ring-buffer mapping test coverage by checking an out-of-bound
> pgoff which has proven to be problematic in the past.
>
> Cc: Shuah Khan <skhan@linuxfoundation.org>
> Cc: linux-kselftest@vger.kernel.org
> Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
>
> diff --git a/tools/testing/selftests/ring-buffer/map_test.c b/tools/testing/selftests/ring-buffer/map_test.c
> index d10a847130fb..a58f520f2f41 100644
> --- a/tools/testing/selftests/ring-buffer/map_test.c
> +++ b/tools/testing/selftests/ring-buffer/map_test.c
> @@ -233,12 +233,18 @@ TEST_F(map, data_mmap)
> ASSERT_NE(data, MAP_FAILED);
> munmap(data, data_len);
>
> - /* Overflow the available subbufs by 1 */
> + /* Offset within ring-buffer bounds, mapping size overflow */
> meta_len += desc->meta->subbuf_size * 2;
> data = mmap(NULL, data_len, PROT_READ, MAP_SHARED,
> desc->cpu_fd, meta_len);
> ASSERT_EQ(data, MAP_FAILED);
>
> + /* Offset outside ring-buffer bounds */
> + data_len = desc->meta->subbuf_size * desc->meta->nr_subbufs;
> + data = mmap(NULL, data_len, PROT_READ, MAP_SHARED,
> + desc->cpu_fd, data_len + (desc->meta->subbuf_size * 2));
> + ASSERT_EQ(data, MAP_FAILED);
> +
> /* Verify meta-page padding */
> if (desc->meta->meta_page_size > getpagesize()) {
> data_len = desc->meta->meta_page_size;
>
> base-commit: 61baee2dc5341c936e7fa7b1ca33c5607868de69
You can ignore the above "base-commit" (I don't have it), as it applies
fine to v6.13-rc4.
-- Steve
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] selftests/ring-buffer: Add test for out-of-bound pgoff mapping
2024-12-24 3:05 ` Steven Rostedt
@ 2025-01-02 21:19 ` Shuah Khan
0 siblings, 0 replies; 3+ messages in thread
From: Shuah Khan @ 2025-01-02 21:19 UTC (permalink / raw)
To: Steven Rostedt
Cc: Vincent Donnefort, mhiramat, linux-kernel, linux-trace-kernel,
kernel-team, aha310510, eadavis, linux-kselftest, Shuah Khan
On 12/23/24 20:05, Steven Rostedt wrote:
>
> Hi Shuah,
>
> Care to take this through your tree?
>
> On Wed, 18 Dec 2024 17:03:18 +0000
> Vincent Donnefort <vdonnefort@google.com> wrote:
>
>> Extend the ring-buffer mapping test coverage by checking an out-of-bound
>> pgoff which has proven to be problematic in the past.
>>
>> Cc: Shuah Khan <skhan@linuxfoundation.org>
>> Cc: linux-kselftest@vger.kernel.org
>> Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
>>
>> diff --git a/tools/testing/selftests/ring-buffer/map_test.c b/tools/testing/selftests/ring-buffer/map_test.c
>> index d10a847130fb..a58f520f2f41 100644
>> --- a/tools/testing/selftests/ring-buffer/map_test.c
>> +++ b/tools/testing/selftests/ring-buffer/map_test.c
>> @@ -233,12 +233,18 @@ TEST_F(map, data_mmap)
>> ASSERT_NE(data, MAP_FAILED);
>> munmap(data, data_len);
>>
>> - /* Overflow the available subbufs by 1 */
>> + /* Offset within ring-buffer bounds, mapping size overflow */
>> meta_len += desc->meta->subbuf_size * 2;
>> data = mmap(NULL, data_len, PROT_READ, MAP_SHARED,
>> desc->cpu_fd, meta_len);
>> ASSERT_EQ(data, MAP_FAILED);
>>
>> + /* Offset outside ring-buffer bounds */
>> + data_len = desc->meta->subbuf_size * desc->meta->nr_subbufs;
>> + data = mmap(NULL, data_len, PROT_READ, MAP_SHARED,
>> + desc->cpu_fd, data_len + (desc->meta->subbuf_size * 2));
>> + ASSERT_EQ(data, MAP_FAILED);
>> +
>> /* Verify meta-page padding */
>> if (desc->meta->meta_page_size > getpagesize()) {
>> data_len = desc->meta->meta_page_size;
>>
>> base-commit: 61baee2dc5341c936e7fa7b1ca33c5607868de69
>
> You can ignore the above "base-commit" (I don't have it), as it applies
> fine to v6.13-rc4.
>
Applied to linux_kselftest next for Linux 6.14-rc1.
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-01-02 21:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-18 17:03 [PATCH] selftests/ring-buffer: Add test for out-of-bound pgoff mapping Vincent Donnefort
2024-12-24 3:05 ` Steven Rostedt
2025-01-02 21:19 ` Shuah Khan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox