[NETFILTER]: nf_conntrack_h323: check range first in sequence extension
Check range before checking STOP flag. This optimization may save a nanosecond or less :) Signed-off-by: Jing Min Zhao <zhaojingmin@vivecode.com> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
067b207b28
Коммит
558585aad0
|
@ -555,15 +555,6 @@ int decode_seq(bitstr_t * bs, field_t * f, char *base, int level)
|
||||||
|
|
||||||
/* Decode the extension components */
|
/* Decode the extension components */
|
||||||
for (opt = 0; opt < bmp2_len; opt++, i++, son++) {
|
for (opt = 0; opt < bmp2_len; opt++, i++, son++) {
|
||||||
if (i < f->ub && son->attr & STOP) {
|
|
||||||
PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, " ",
|
|
||||||
son->name);
|
|
||||||
return H323_ERROR_STOP;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!((0x80000000 >> opt) & bmp2)) /* Not present */
|
|
||||||
continue;
|
|
||||||
|
|
||||||
/* Check Range */
|
/* Check Range */
|
||||||
if (i >= f->ub) { /* Newer Version? */
|
if (i >= f->ub) { /* Newer Version? */
|
||||||
CHECK_BOUND(bs, 2);
|
CHECK_BOUND(bs, 2);
|
||||||
|
@ -573,6 +564,15 @@ int decode_seq(bitstr_t * bs, field_t * f, char *base, int level)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (son->attr & STOP) {
|
||||||
|
PRINT("%*.s%s\n", (level + 1) * TAB_SIZE, " ",
|
||||||
|
son->name);
|
||||||
|
return H323_ERROR_STOP;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!((0x80000000 >> opt) & bmp2)) /* Not present */
|
||||||
|
continue;
|
||||||
|
|
||||||
CHECK_BOUND(bs, 2);
|
CHECK_BOUND(bs, 2);
|
||||||
len = get_len(bs);
|
len = get_len(bs);
|
||||||
CHECK_BOUND(bs, len);
|
CHECK_BOUND(bs, len);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче