aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2014-07-12 09:49:16 -0400
committerDavid S. Miller <davem@davemloft.net>2014-07-14 02:27:41 -0400
commitec31a05c4dfa95149b1754d9de92831a5a95c636 (patch)
tree239b9a7ac53a864e45a9159faab20a4af077a489 /net/core
parent66568b392539fc8224f4d7070a55d56e9d13c150 (diff)
net: filter: sk_chk_filter() no longer mangles filter
Add const attribute to filter argument to make clear it is no longer modified. Signed-off-by: Eric Dumazet <edumazet@google.com> Acked-by: Daniel Borkmann <dborkman@redhat.com> Acked-by: Alexei Starovoitov <ast@plumgrid.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/filter.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/filter.c b/net/core/filter.c
index 87af1e3e56c0..b90ae7fb3b89 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -1085,7 +1085,7 @@ err:
1085 * a cell if not previously written, and we check all branches to be sure 1085 * a cell if not previously written, and we check all branches to be sure
1086 * a malicious user doesn't try to abuse us. 1086 * a malicious user doesn't try to abuse us.
1087 */ 1087 */
1088static int check_load_and_stores(struct sock_filter *filter, int flen) 1088static int check_load_and_stores(const struct sock_filter *filter, int flen)
1089{ 1089{
1090 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */ 1090 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
1091 int pc, ret = 0; 1091 int pc, ret = 0;
@@ -1218,7 +1218,7 @@ static bool chk_code_allowed(u16 code_to_probe)
1218 * 1218 *
1219 * Returns 0 if the rule set is legal or -EINVAL if not. 1219 * Returns 0 if the rule set is legal or -EINVAL if not.
1220 */ 1220 */
1221int sk_chk_filter(struct sock_filter *filter, unsigned int flen) 1221int sk_chk_filter(const struct sock_filter *filter, unsigned int flen)
1222{ 1222{
1223 bool anc_found; 1223 bool anc_found;
1224 int pc; 1224 int pc;
@@ -1228,7 +1228,7 @@ int sk_chk_filter(struct sock_filter *filter, unsigned int flen)
1228 1228
1229 /* Check the filter code now */ 1229 /* Check the filter code now */
1230 for (pc = 0; pc < flen; pc++) { 1230 for (pc = 0; pc < flen; pc++) {
1231 struct sock_filter *ftest = &filter[pc]; 1231 const struct sock_filter *ftest = &filter[pc];
1232 1232
1233 /* May we actually operate on this code? */ 1233 /* May we actually operate on this code? */
1234 if (!chk_code_allowed(ftest->code)) 1234 if (!chk_code_allowed(ftest->code))