diff options
author | Patrick McHardy <kaber@trash.net> | 2008-01-23 23:33:32 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:11:18 -0500 |
commit | cee63723b358e594225e812d6e14a2a0abfd5c88 (patch) | |
tree | 847f929e0f445cca8cdf55d7c17a56b0d0f2ec68 /net/sched/act_nat.c | |
parent | ab27cfb85c5778400740ad0c401bde65616774eb (diff) |
[NET_SCHED]: Propagate nla_parse return value
nla_parse() returns more detailed errno codes, propagate them back on
error.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_nat.c')
-rw-r--r-- | net/sched/act_nat.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/sched/act_nat.c b/net/sched/act_nat.c index be007bb31b59..5a512d4dc37c 100644 --- a/net/sched/act_nat.c +++ b/net/sched/act_nat.c | |||
@@ -45,13 +45,17 @@ static int tcf_nat_init(struct nlattr *nla, struct nlattr *est, | |||
45 | { | 45 | { |
46 | struct nlattr *tb[TCA_NAT_MAX + 1]; | 46 | struct nlattr *tb[TCA_NAT_MAX + 1]; |
47 | struct tc_nat *parm; | 47 | struct tc_nat *parm; |
48 | int ret = 0; | 48 | int ret = 0, err; |
49 | struct tcf_nat *p; | 49 | struct tcf_nat *p; |
50 | struct tcf_common *pc; | 50 | struct tcf_common *pc; |
51 | 51 | ||
52 | if (nla == NULL || nla_parse_nested(tb, TCA_NAT_MAX, nla, NULL) < 0) | 52 | if (nla == NULL) |
53 | return -EINVAL; | 53 | return -EINVAL; |
54 | 54 | ||
55 | err = nla_parse_nested(tb, TCA_NAT_MAX, nla, NULL); | ||
56 | if (err < 0) | ||
57 | return err; | ||
58 | |||
55 | if (tb[TCA_NAT_PARMS] == NULL || | 59 | if (tb[TCA_NAT_PARMS] == NULL || |
56 | nla_len(tb[TCA_NAT_PARMS]) < sizeof(*parm)) | 60 | nla_len(tb[TCA_NAT_PARMS]) < sizeof(*parm)) |
57 | return -EINVAL; | 61 | return -EINVAL; |