mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cherrypick revision 2412 from trunk, store magic token in unsigned int

Browse source 
Original log:
Store the aa_change_hat magic token in an unsigned long in the test suite

The magic token used in the test suite is incorrectly stored
as an int rather than unsigned long leading to failure like this:

running changehat_misc
/tmp/testlibCTcwOe/source/trusty/apparmor-2.8.95~2411/tests/regression/apparmor/prologue.inc: line 176: 20184
Killed                  $testexec "$@" > $outfile 2>&1
Error: changehat_twice failed. Test 'CHANGEHAT (subprofile->subprofile)' was expected to 'pass'. Reason for
failure 'killed by signal 9'

Signed-off-by: Seth Arnold <seth.arnold@canonical.com>
Acked-by: Steve Beattie <steve@nxnw.org>
This commit is contained in:
Seth Arnold 2014-03-04 10:57:23 -08:00
parent 155bdd07af
commit 3df7f56154
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/regression/apparmor/changehat_twice.c
View file

@ -22,7 +22,8 @@
int main(int argc, char *argv[])
{
int rc, magic;
int rc;
unsigned long magic;
if (argc != 5){
fprintf(stderr, "usage: %s profile1 profile2 goodmagic|badmagic file\n",

2
tests/regression/apparmor/changehat_wrapper.c
View file

@ -87,7 +87,7 @@ int main(int argc, char *argv[]) {
int filedes[2];
int c, o;
char buf[BUFSIZ];
unsigned int magic_token = SD_ID_MAGIC+1;
unsigned long magic_token = SD_ID_MAGIC+1;
int manual = 0;
int exit_hat = 0;
char * manual_string;