Skip to content

Commit ba808cb

Browse files
keesjrjohansen
authored andcommitted
apparmor: aa_buffer: Convert 1-element array to flexible array
In the ongoing effort to convert all fake flexible arrays to proper flexible arrays, replace aa_buffer's 1-element "buffer" member with a flexible array. Signed-off-by: Kees Cook <[email protected]> Signed-off-by: John Johansen <[email protected]>
1 parent 6600e9f commit ba808cb

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

security/apparmor/lsm.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ int apparmor_initialized;
4646

4747
union aa_buffer {
4848
struct list_head list;
49-
char buffer[1];
49+
DECLARE_FLEX_ARRAY(char, buffer);
5050
};
5151

5252
#define RESERVE_COUNT 2
@@ -1649,7 +1649,7 @@ char *aa_get_buffer(bool in_atomic)
16491649
list_del(&aa_buf->list);
16501650
buffer_count--;
16511651
spin_unlock(&aa_buffers_lock);
1652-
return &aa_buf->buffer[0];
1652+
return aa_buf->buffer;
16531653
}
16541654
if (in_atomic) {
16551655
/*
@@ -1672,7 +1672,7 @@ char *aa_get_buffer(bool in_atomic)
16721672
pr_warn_once("AppArmor: Failed to allocate a memory buffer.\n");
16731673
return NULL;
16741674
}
1675-
return &aa_buf->buffer[0];
1675+
return aa_buf->buffer;
16761676
}
16771677

16781678
void aa_put_buffer(char *buf)
@@ -1749,7 +1749,7 @@ static int __init alloc_buffers(void)
17491749
destroy_buffers();
17501750
return -ENOMEM;
17511751
}
1752-
aa_put_buffer(&aa_buf->buffer[0]);
1752+
aa_put_buffer(aa_buf->buffer);
17531753
}
17541754
return 0;
17551755
}

0 commit comments

Comments
 (0)