diff options
author | James Morris <jmorris@namei.org> | 2009-09-22 19:43:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 10:39:29 -0400 |
commit | 88e9d34c727883d7d6f02cf1475b3ec98b8480c7 (patch) | |
tree | 475f544536d52739e0929e7727cab5124e855a06 /drivers/char | |
parent | b7ed698cc9d556306a4088c238e2ea9311ea2cb3 (diff) |
seq_file: constify seq_operations
Make all seq_operations structs const, to help mitigate against
revectoring user-triggerable function pointers.
This is derived from the grsecurity patch, although generated from scratch
because it's simpler than extracting the changes from there.
Signed-off-by: James Morris <jmorris@namei.org>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Acked-by: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/misc.c | 2 | ||||
-rw-r--r-- | drivers/char/tpm/tpm_bios.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/misc.c b/drivers/char/misc.c index 1ee27cc23426..07fa612a58d5 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c | |||
@@ -91,7 +91,7 @@ static int misc_seq_show(struct seq_file *seq, void *v) | |||
91 | } | 91 | } |
92 | 92 | ||
93 | 93 | ||
94 | static struct seq_operations misc_seq_ops = { | 94 | static const struct seq_operations misc_seq_ops = { |
95 | .start = misc_seq_start, | 95 | .start = misc_seq_start, |
96 | .next = misc_seq_next, | 96 | .next = misc_seq_next, |
97 | .stop = misc_seq_stop, | 97 | .stop = misc_seq_stop, |
diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c index 0c2f55a38b95..bf2170fb1cdd 100644 --- a/drivers/char/tpm/tpm_bios.c +++ b/drivers/char/tpm/tpm_bios.c | |||
@@ -343,14 +343,14 @@ static int tpm_ascii_bios_measurements_show(struct seq_file *m, void *v) | |||
343 | return 0; | 343 | return 0; |
344 | } | 344 | } |
345 | 345 | ||
346 | static struct seq_operations tpm_ascii_b_measurments_seqops = { | 346 | static const struct seq_operations tpm_ascii_b_measurments_seqops = { |
347 | .start = tpm_bios_measurements_start, | 347 | .start = tpm_bios_measurements_start, |
348 | .next = tpm_bios_measurements_next, | 348 | .next = tpm_bios_measurements_next, |
349 | .stop = tpm_bios_measurements_stop, | 349 | .stop = tpm_bios_measurements_stop, |
350 | .show = tpm_ascii_bios_measurements_show, | 350 | .show = tpm_ascii_bios_measurements_show, |
351 | }; | 351 | }; |
352 | 352 | ||
353 | static struct seq_operations tpm_binary_b_measurments_seqops = { | 353 | static const struct seq_operations tpm_binary_b_measurments_seqops = { |
354 | .start = tpm_bios_measurements_start, | 354 | .start = tpm_bios_measurements_start, |
355 | .next = tpm_bios_measurements_next, | 355 | .next = tpm_bios_measurements_next, |
356 | .stop = tpm_bios_measurements_stop, | 356 | .stop = tpm_bios_measurements_stop, |