hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apparmor: improve get_buffers macro by using get_cpu_ptr 

Refactor get_buffers so the cpu_ptr can be obtained in the outer
layer, instead of inside the macro.

This also enables us to cleanup the code and use get_cpu_ptr,
to handle the preempt_disable()

Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Seth Arnold <seth.arnold@canonical.com>
This commit is contained in:
John Johansen 2018-05-04 02:18:07 -07:00
parent 52e7128ebb
commit 38125c2c2b
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
security/apparmor/include/path.h
View File

@ -43,10 +43,11 @@ struct aa_buffers {
DECLARE_PER_CPU(struct aa_buffers, aa_buffers); DECLARE_PER_CPU(struct aa_buffers, aa_buffers);
#define ASSIGN(FN, X, N) ((X) = FN(N)) #define ASSIGN(FN, A, X, N) ((X) = FN(A, N))
#define EVAL1(FN, X) ASSIGN(FN, X, 0) /*X = FN(0)*/ #define EVAL1(FN, A, X) ASSIGN(FN, A, X, 0) /*X = FN(0)*/
#define EVAL2(FN, X, Y...) do { ASSIGN(FN, X, 1); EVAL1(FN, Y); } while (0) #define EVAL2(FN, A, X, Y...) \
#define EVAL(FN, X...) CONCATENATE(EVAL, COUNT_ARGS(X))(FN, X) do { ASSIGN(FN, A, X, 1); EVAL1(FN, A, Y); } while (0)
#define EVAL(FN, A, X...) CONCATENATE(EVAL, COUNT_ARGS(X))(FN, A, X)
#define for_each_cpu_buffer(I) for ((I) = 0; (I) < MAX_PATH_BUFFERS; (I)++) #define for_each_cpu_buffer(I) for ((I) = 0; (I) < MAX_PATH_BUFFERS; (I)++)
@ -56,26 +57,24 @@ DECLARE_PER_CPU(struct aa_buffers, aa_buffers);
#define AA_BUG_PREEMPT_ENABLED(X) /* nop */ #define AA_BUG_PREEMPT_ENABLED(X) /* nop */
#endif #endif
#define __get_buffer(N) ({ \ #define __get_buffer(C, N) ({ \
struct aa_buffers *__cpu_var; \
AA_BUG_PREEMPT_ENABLED("__get_buffer without preempt disabled"); \ AA_BUG_PREEMPT_ENABLED("__get_buffer without preempt disabled"); \
__cpu_var = this_cpu_ptr(&aa_buffers); \ (C)->buf[(N)]; })
__cpu_var->buf[(N)]; })
#define __get_buffers(X...) EVAL(__get_buffer, X) #define __get_buffers(C, X...) EVAL(__get_buffer, C, X)
#define __put_buffers(X, Y...) ((void)&(X)) #define __put_buffers(X, Y...) ((void)&(X))
#define get_buffers(X...) \ #define get_buffers(X...) \
do { \ do { \
preempt_disable(); \ struct aa_buffers *__cpu_var = get_cpu_ptr(&aa_buffers); \
__get_buffers(X); \ __get_buffers(__cpu_var, X); \
} while (0) } while (0)
#define put_buffers(X, Y...) \ #define put_buffers(X, Y...) \
do { \ do { \
__put_buffers(X, Y); \ __put_buffers(X, Y); \
preempt_enable(); \ put_cpu_ptr(&aa_buffers); \
} while (0) } while (0)
#endif /* __AA_PATH_H */ #endif /* __AA_PATH_H */