Skip to content

Commit 7410218

Browse files
committed
src/nvidia: kbuild - hook up cocci scripts
Hook up the various coccinelle scripts so they're actually used. Signed-off-by: Mathias Krause <minipli@grsecurity.net>
1 parent 34e829c commit 7410218

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

src/nvidia/nvidia.Kbuild

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,24 @@ SPATCH_OPTS += --smpl-spacing # don't mess with spacing too much to keep diffs
3333
SPATCH_OPTS += --very-quiet
3434

3535
# order here is important and defines patch order too!
36-
COCCI_SCRIPTS_ARGS :=
36+
COCCI_SCRIPTS_ARGS := fix_nvoc_dtor.cocci
37+
COCCI_SCRIPTS_ARGS += fix_nvoc_ctor.cocci
38+
COCCI_SCRIPTS_ARGS += fix_nvoc_pfunc_type.cocci
39+
COCCI_SCRIPTS_ARGS += fix_nvoc_pfunc_null.cocci:pfunc
40+
COCCI_SCRIPTS_ARGS += fix_nvoc_pfunc_addr.cocci:pfunc_list
41+
COCCI_SCRIPTS_ARGS += fix_nvoc_pfunc_thunk.cocci:pfunc
42+
COCCI_SCRIPTS_ARGS += fix_nvoc_pfunc_use.cocci
43+
COCCI_SCRIPTS_ARGS += fix_hal_iface_init.cocci
44+
COCCI_SCRIPTS_ARGS += fix_rpc_hal_init.cocci:rpc_hal_init
3745

3846
COCCI_SCRIPTS := $(filter %.cocci,$(subst :, ,$(COCCI_SCRIPTS_ARGS)))
3947
COCCI_PATCHES = $(addprefix 0???-,$(COCCI_SCRIPTS:.cocci=.diff))
4048
COCCI_PATCH_MARKER := .cocci_patched
4149

42-
PATCH_CANDIDATES := $(filter $(nvidia_src)/generated/%,$(ALL_SRCS))
50+
# XXX: Unfortunately, have to hardcode the list of potentially affected sources
51+
# XXX: as some cocci scripts override the --dir option. :(
52+
PATCH_CANDIDATES := $(addprefix $(nvidia_src)/,generated/% src/%)
53+
PATCH_CANDIDATES := $(filter $(PATCH_CANDIDATES),$(ALL_SRCS))
4354
$(addprefix $(obj)/,$(PATCH_CANDIDATES)): $(obj)/$(nvidia_src)/$(COCCI_PATCH_MARKER)
4455

4556
$(obj)/$(nvidia_src)/$(COCCI_PATCH_MARKER): $(addprefix $(obj)/$(nvidia_src)/,$(COCCI_SCRIPTS))

0 commit comments

Comments
 (0)