From 253c8454597dcf91516ff0e452ff9dccb3b9f458 Mon Sep 17 00:00:00 2001 From: Djalal Harouni Date: Fri, 9 Jan 2015 23:18:45 +0100 Subject: [PATCH] test-attach-flags: make sure to restore kdbus attach_flags_mask on errors If one of the test fails, then always restore /sys/module/kdbus/parameters/attach_flags_mask to its previous saved value. Signed-off-by: Djalal Harouni --- test/test-attach-flags.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/test-attach-flags.c b/test/test-attach-flags.c index 633250c..8bf6bc8 100644 --- a/test/test-attach-flags.c +++ b/test/test-attach-flags.c @@ -720,23 +720,27 @@ int kdbus_test_attach_flags(struct kdbus_test_env *env) * Test the connection creation attach flags */ ret = kdbus_test_peers_creation(env); + /* Restore previous kdbus mask */ + kdbus_sysfs_set_parameter_mask(env->mask_param_path, + old_kdbus_flags_mask); ASSERT_RETURN(ret == 0); /* * Test the CONN_INFO ioctl attach flags */ ret = kdbus_test_peers_info(env); + /* Restore previous kdbus mask */ + kdbus_sysfs_set_parameter_mask(env->mask_param_path, + old_kdbus_flags_mask); ASSERT_RETURN(ret == 0); /* * Test the Bus creator info and its attach flags */ ret = kdbus_test_bus_creator_info(env); - ASSERT_RETURN(ret == 0); - /* Restore previous kdbus mask */ - ret = kdbus_sysfs_set_parameter_mask(env->mask_param_path, - old_kdbus_flags_mask); + kdbus_sysfs_set_parameter_mask(env->mask_param_path, + old_kdbus_flags_mask); ASSERT_RETURN(ret == 0); ret = kdbus_sysfs_get_parameter_mask(env->mask_param_path, -- 2.34.1