git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'apparmor-pr-2019-12-03' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
security
/
apparmor
/
match.c
diff --git
a/security/apparmor/match.c
b/security/apparmor/match.c
index 6ccd3734a841f477eac8cad576ea0ff600ddb7d8..525ce22dc0e99f24cadc6879f90e2bb7e8030435 100644
(file)
--- a/
security/apparmor/match.c
+++ b/
security/apparmor/match.c
@@
-616,8
+616,8
@@
unsigned int aa_dfa_matchn_until(struct aa_dfa *dfa, unsigned int start,
#define inc_wb_pos(wb) \
do { \
#define inc_wb_pos(wb) \
do { \
- wb->pos = (wb->pos + 1) & (
wb->size - 1);
\
- wb->len = (wb->len + 1) & (
wb->size - 1);
\
+ wb->pos = (wb->pos + 1) & (
WB_HISTORY_SIZE - 1);
\
+ wb->len = (wb->len + 1) & (
WB_HISTORY_SIZE - 1);
\
} while (0)
/* For DFAs that don't support extended tagging of states */
} while (0)
/* For DFAs that don't support extended tagging of states */
@@
-636,7
+636,7
@@
static bool is_loop(struct match_workbuf *wb, unsigned int state,
return true;
}
if (pos == 0)
return true;
}
if (pos == 0)
- pos =
wb->size
;
+ pos =
WB_HISTORY_SIZE
;
pos--;
}
pos--;
}