diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-07-20 14:09:34 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-07-20 15:04:47 +0200 |
| commit | 367cbfaae87c1f539c729b0653d920701beac3be (patch) | |
| tree | 232077cd854cc757784383b56abcde8383b006dd /src/expr/data_reg.c | |
| parent | cac9b26874d60aa17c7cabe46d33e9114b24885d (diff) | |
src: stricter netlink attribute length validation
If the kernel sends us different data length for a given attribute,
stop further processing and indicate that an ABI breakage has ocurred.
This is an example of the (hypothetical) message that is shown in that
case:
nf_tables kernel ABI is broken, contact your vendor.
table.c:214 reason: Numerical result out of range
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expr/data_reg.c')
| -rw-r--r-- | src/expr/data_reg.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c index 44281f7..28ad164 100644 --- a/src/expr/data_reg.c +++ b/src/expr/data_reg.c @@ -405,16 +405,12 @@ static int nft_data_parse_cb(const struct nlattr *attr, void *data) switch(type) { case NFTA_DATA_VALUE: - if (mnl_attr_validate(attr, MNL_TYPE_BINARY) < 0) { - perror("mnl_attr_validate"); - return MNL_CB_ERROR; - } + if (mnl_attr_validate(attr, MNL_TYPE_BINARY) < 0) + abi_breakage(); break; case NFTA_DATA_VERDICT: - if (mnl_attr_validate(attr, MNL_TYPE_NESTED) < 0) { - perror("mnl_attr_validate"); - return MNL_CB_ERROR; - } + if (mnl_attr_validate(attr, MNL_TYPE_NESTED) < 0) + abi_breakage(); break; } tb[type] = attr; @@ -431,16 +427,12 @@ static int nft_verdict_parse_cb(const struct nlattr *attr, void *data) switch(type) { case NFTA_VERDICT_CODE: - if (mnl_attr_validate(attr, MNL_TYPE_U32) < 0) { - perror("mnl_attr_validate"); - return MNL_CB_ERROR; - } + if (mnl_attr_validate(attr, MNL_TYPE_U32) < 0) + abi_breakage(); break; case NFTA_VERDICT_CHAIN: - if (mnl_attr_validate(attr, MNL_TYPE_STRING) < 0) { - perror("mnl_attr_validate"); - return MNL_CB_ERROR; - } + if (mnl_attr_validate(attr, MNL_TYPE_STRING) < 0) + abi_breakage(); break; } tb[type] = attr; |