Accepting request 997498 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/997498
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/liburing?expand=0&rev=11
This commit is contained in:
Richard Brown 2022-08-17 09:31:54 +00:00 committed by Git OBS Bridge
commit 667f4bc662
3 changed files with 53 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Aug 16 10:53:40 UTC 2022 - Jiri Slaby <jslaby@suse.cz>
- add test-xattr-don-t-rely-on-NUL-termination.patch (bsc#1202413)
-------------------------------------------------------------------
Fri Jul 8 12:40:13 UTC 2022 - Dirk Müller <dmueller@suse.com>

View File

@ -26,6 +26,8 @@ Group: Development/Libraries/C and C++
URL: https://git.kernel.dk/cgit/liburing
Source: https://git.kernel.dk/cgit/liburing/snapshot/%{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM: has been accepted upstream
Patch0: test-xattr-don-t-rely-on-NUL-termination.patch
# PATCH-FIX-UPSTREAM: has been accepted upstream
# [1/1] Handle EINTR in tests
# commit: fa67f6aedcfdaffc14cbf0b631253477b2565ef0
Patch2: handle-eintr.patch

View File

@ -0,0 +1,46 @@
From: Jiri Slaby <jslaby@suse.cz>
Date: Tue, 16 Aug 2022 12:44:14 +0200
Subject: test/xattr: don't rely on NUL-termination
Patch-mainline: yes
Git-commit: bf3fedba890e66d644692910964fe1d8cbf4fb1b
References: bsc#1202413
The returned value from io_uring_fgetxattr() needs not be NUL-terminated,
as we stored non-NUL-terminated string by io_uring_fsetxattr()
previously.
So don't use strlen() on value, but on VALUE1, and VALUE2 respectively.
This fixes random test failures.
Cc: Stefan Roesch <shr@fb.com>
Fixes: d6515e06f73c ("liburing: Add new test program to verify xattr support")
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
test/xattr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/xattr.c b/test/xattr.c
index d88059cb..101d82b3 100644
--- a/test/xattr.c
+++ b/test/xattr.c
@@ -210,14 +210,14 @@ static int test_fxattr(void)
/* Test reading attributes. */
value_len = io_uring_fgetxattr(&ring, fd, KEY1, value, XATTR_SIZE);
- if (value_len != strlen(value) || strncmp(value, VALUE1, value_len)) {
+ if (value_len != strlen(VALUE1) || strncmp(value, VALUE1, value_len)) {
fprintf(stderr, "Error: fgetxattr expected value: %s, returned value: %s\n", VALUE1, value);
rc = -1;
goto Exit;
}
value_len = io_uring_fgetxattr(&ring, fd, KEY2, value, XATTR_SIZE);
- if (value_len != strlen(value)|| strncmp(value, VALUE2, value_len)) {
+ if (value_len != strlen(VALUE2) || strncmp(value, VALUE2, value_len)) {
fprintf(stderr, "Error: fgetxattr expected value: %s, returned value: %s\n", VALUE2, value);
rc = -1;
goto Exit;
--
2.35.3