diff options
| author | Thomas Graf <tgraf@suug.ch> | 2008-06-03 16:36:54 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-03 16:36:54 -0700 |
| commit | bc3ed28caaef55e7e3a9316464256353c5f9b1df (patch) | |
| tree | 3aed4521aa2d74a36ee2b192c2e229fd23fbe732 /net/core | |
| parent | 1f9d11c7c99da706e33646c3a9080dd5a8ef9a0b (diff) | |
| download | op-kernel-dev-bc3ed28caaef55e7e3a9316464256353c5f9b1df.zip op-kernel-dev-bc3ed28caaef55e7e3a9316464256353c5f9b1df.tar.gz | |
netlink: Improve returned error codes
Make nlmsg_trim(), nlmsg_cancel(), genlmsg_cancel(), and
nla_nest_cancel() void functions.
Return -EMSGSIZE instead of -1 if the provided message buffer is not
big enough.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/neighbour.c | 3 | ||||
| -rw-r--r-- | net/core/rtnetlink.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 3896de7..65f01f7 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1714,7 +1714,8 @@ static int neightbl_fill_parms(struct sk_buff *skb, struct neigh_parms *parms) return nla_nest_end(skb, nest); nla_put_failure: - return nla_nest_cancel(skb, nest); + nla_nest_cancel(skb, nest); + return -EMSGSIZE; } static int neightbl_fill_info(struct sk_buff *skb, struct neigh_table *tbl, diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index cf857c4..a9a7721 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -498,7 +498,8 @@ int rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics) return nla_nest_end(skb, mx); nla_put_failure: - return nla_nest_cancel(skb, mx); + nla_nest_cancel(skb, mx); + return -EMSGSIZE; } int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, u32 id, |
