Merge tag 'linux_kselftest_active-fixes-6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull Kselftest fix from Shuah Khan: "One single fix to assert check in user_events abi_test to properly check bit value on Big Endian architectures. The code treated the bit values as Little Endian and the check failed on Big Endian" * tag 'linux_kselftest_active-fixes-6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftests/user_events: Fix abi_test for BE archs
This commit is contained in:
@@ -47,7 +47,7 @@ static int change_event(bool enable)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int reg_enable(long *enable, int size, int bit)
|
||||
static int reg_enable(void *enable, int size, int bit)
|
||||
{
|
||||
struct user_reg reg = {0};
|
||||
int fd = open(data_file, O_RDWR);
|
||||
@@ -69,7 +69,7 @@ static int reg_enable(long *enable, int size, int bit)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int reg_disable(long *enable, int bit)
|
||||
static int reg_disable(void *enable, int bit)
|
||||
{
|
||||
struct user_unreg reg = {0};
|
||||
int fd = open(data_file, O_RDWR);
|
||||
@@ -90,7 +90,8 @@ static int reg_disable(long *enable, int bit)
|
||||
}
|
||||
|
||||
FIXTURE(user) {
|
||||
long check;
|
||||
int check;
|
||||
long check_long;
|
||||
bool umount;
|
||||
};
|
||||
|
||||
@@ -99,6 +100,7 @@ FIXTURE_SETUP(user) {
|
||||
|
||||
change_event(false);
|
||||
self->check = 0;
|
||||
self->check_long = 0;
|
||||
}
|
||||
|
||||
FIXTURE_TEARDOWN(user) {
|
||||
@@ -136,9 +138,9 @@ TEST_F(user, bit_sizes) {
|
||||
|
||||
#if BITS_PER_LONG == 8
|
||||
/* Allow 0-64 bits for 64-bit */
|
||||
ASSERT_EQ(0, reg_enable(&self->check, sizeof(long), 63));
|
||||
ASSERT_NE(0, reg_enable(&self->check, sizeof(long), 64));
|
||||
ASSERT_EQ(0, reg_disable(&self->check, 63));
|
||||
ASSERT_EQ(0, reg_enable(&self->check_long, sizeof(long), 63));
|
||||
ASSERT_NE(0, reg_enable(&self->check_long, sizeof(long), 64));
|
||||
ASSERT_EQ(0, reg_disable(&self->check_long, 63));
|
||||
#endif
|
||||
|
||||
/* Disallowed sizes (everything beside 4 and 8) */
|
||||
@@ -200,7 +202,7 @@ static int clone_check(void *check)
|
||||
for (i = 0; i < 10; ++i) {
|
||||
usleep(100000);
|
||||
|
||||
if (*(long *)check)
|
||||
if (*(int *)check)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user