Skip to content

Commit

Permalink
netlink: Improve returned error codes
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Thomas Graf authored and David S. Miller committed Jun 3, 2008
1 parent 1f9d11c commit bc3ed28
Show file tree
Hide file tree
Showing 11 changed files with 42 additions and 32 deletions.
4 changes: 2 additions & 2 deletions include/net/genetlink.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ static inline int genlmsg_end(struct sk_buff *skb, void *hdr)
* @skb: socket buffer the message is stored in
* @hdr: generic netlink message header
*/
static inline int genlmsg_cancel(struct sk_buff *skb, void *hdr)
static inline void genlmsg_cancel(struct sk_buff *skb, void *hdr)
{
return nlmsg_cancel(skb, hdr - GENL_HDRLEN - NLMSG_HDRLEN);
nlmsg_cancel(skb, hdr - GENL_HDRLEN - NLMSG_HDRLEN);
}

/**
Expand Down
20 changes: 9 additions & 11 deletions include/net/netlink.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,14 +556,12 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
* @skb: socket buffer the message is stored in
* @mark: mark to trim to
*
* Trims the message to the provided mark. Returns -1.
* Trims the message to the provided mark.
*/
static inline int nlmsg_trim(struct sk_buff *skb, const void *mark)
static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
{
if (mark)
skb_trim(skb, (unsigned char *) mark - skb->data);

return -1;
}

/**
Expand All @@ -572,11 +570,11 @@ static inline int nlmsg_trim(struct sk_buff *skb, const void *mark)
* @nlh: netlink message header
*
* Removes the complete netlink message including all
* attributes from the socket buffer again. Returns -1.
* attributes from the socket buffer again.
*/
static inline int nlmsg_cancel(struct sk_buff *skb, struct nlmsghdr *nlh)
static inline void nlmsg_cancel(struct sk_buff *skb, struct nlmsghdr *nlh)
{
return nlmsg_trim(skb, nlh);
nlmsg_trim(skb, nlh);
}

/**
Expand Down Expand Up @@ -775,7 +773,7 @@ static inline int __nla_parse_nested_compat(struct nlattr *tb[], int maxtype,
int nested_len = nla_len(nla) - NLA_ALIGN(len);

if (nested_len < 0)
return -1;
return -EINVAL;
if (nested_len >= nla_attr_size(0))
return nla_parse(tb, maxtype, nla_data(nla) + NLA_ALIGN(len),
nested_len, policy);
Expand Down Expand Up @@ -1080,11 +1078,11 @@ static inline int nla_nest_compat_end(struct sk_buff *skb, struct nlattr *start)
* @start: container attribute
*
* Removes the container attribute and including all nested
* attributes. Returns -1.
* attributes. Returns -EMSGSIZE
*/
static inline int nla_nest_cancel(struct sk_buff *skb, struct nlattr *start)
static inline void nla_nest_cancel(struct sk_buff *skb, struct nlattr *start)
{
return nlmsg_trim(skb, start);
nlmsg_trim(skb, start);
}

/**
Expand Down
3 changes: 2 additions & 1 deletion net/core/neighbour.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion net/core/rtnetlink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
12 changes: 6 additions & 6 deletions net/netlink/attr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,13 +400,13 @@ void __nla_put_nohdr(struct sk_buff *skb, int attrlen, const void *data)
* @attrlen: length of attribute payload
* @data: head of attribute payload
*
* Returns -1 if the tailroom of the skb is insufficient to store
* Returns -EMSGSIZE if the tailroom of the skb is insufficient to store
* the attribute header and payload.
*/
int nla_put(struct sk_buff *skb, int attrtype, int attrlen, const void *data)
{
if (unlikely(skb_tailroom(skb) < nla_total_size(attrlen)))
return -1;
return -EMSGSIZE;

__nla_put(skb, attrtype, attrlen, data);
return 0;
Expand All @@ -418,13 +418,13 @@ int nla_put(struct sk_buff *skb, int attrtype, int attrlen, const void *data)
* @attrlen: length of attribute payload
* @data: head of attribute payload
*
* Returns -1 if the tailroom of the skb is insufficient to store
* Returns -EMSGSIZE if the tailroom of the skb is insufficient to store
* the attribute payload.
*/
int nla_put_nohdr(struct sk_buff *skb, int attrlen, const void *data)
{
if (unlikely(skb_tailroom(skb) < NLA_ALIGN(attrlen)))
return -1;
return -EMSGSIZE;

__nla_put_nohdr(skb, attrlen, data);
return 0;
Expand All @@ -436,13 +436,13 @@ int nla_put_nohdr(struct sk_buff *skb, int attrlen, const void *data)
* @attrlen: length of attribute payload
* @data: head of attribute payload
*
* Returns -1 if the tailroom of the skb is insufficient to store
* Returns -EMSGSIZE if the tailroom of the skb is insufficient to store
* the attribute payload.
*/
int nla_append(struct sk_buff *skb, int attrlen, const void *data)
{
if (unlikely(skb_tailroom(skb) < NLA_ALIGN(attrlen)))
return -1;
return -EMSGSIZE;

memcpy(skb_put(skb, attrlen), data, attrlen);
return 0;
Expand Down
6 changes: 4 additions & 2 deletions net/netlink/genetlink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,8 @@ static int ctrl_fill_info(struct genl_family *family, u32 pid, u32 seq,
return genlmsg_end(skb, hdr);

nla_put_failure:
return genlmsg_cancel(skb, hdr);
genlmsg_cancel(skb, hdr);
return -EMSGSIZE;
}

static int ctrl_fill_mcgrp_info(struct genl_multicast_group *grp, u32 pid,
Expand Down Expand Up @@ -590,7 +591,8 @@ static int ctrl_fill_mcgrp_info(struct genl_multicast_group *grp, u32 pid,
return genlmsg_end(skb, hdr);

nla_put_failure:
return genlmsg_cancel(skb, hdr);
genlmsg_cancel(skb, hdr);
return -EMSGSIZE;
}

static int ctrl_dumpfamily(struct sk_buff *skb, struct netlink_callback *cb)
Expand Down
6 changes: 4 additions & 2 deletions net/sched/sch_dsmark.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,8 @@ static int dsmark_dump_class(struct Qdisc *sch, unsigned long cl,
return nla_nest_end(skb, opts);

nla_put_failure:
return nla_nest_cancel(skb, opts);
nla_nest_cancel(skb, opts);
return -EMSGSIZE;
}

static int dsmark_dump(struct Qdisc *sch, struct sk_buff *skb)
Expand All @@ -466,7 +467,8 @@ static int dsmark_dump(struct Qdisc *sch, struct sk_buff *skb)
return nla_nest_end(skb, opts);

nla_put_failure:
return nla_nest_cancel(skb, opts);
nla_nest_cancel(skb, opts);
return -EMSGSIZE;
}

static const struct Qdisc_class_ops dsmark_class_ops = {
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_gred.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,8 @@ static int gred_dump(struct Qdisc *sch, struct sk_buff *skb)
return nla_nest_end(skb, opts);

nla_put_failure:
return nla_nest_cancel(skb, opts);
nla_nest_cancel(skb, opts);
return -EMSGSIZE;
}

static void gred_destroy(struct Qdisc *sch)
Expand Down
2 changes: 1 addition & 1 deletion net/sched/sch_hfsc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1360,7 +1360,7 @@ hfsc_dump_class(struct Qdisc *sch, unsigned long arg, struct sk_buff *skb,

nla_put_failure:
nla_nest_cancel(skb, nest);
return -1;
return -EMSGSIZE;
}

static int
Expand Down
3 changes: 2 additions & 1 deletion net/sched/sch_red.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,8 @@ static int red_dump(struct Qdisc *sch, struct sk_buff *skb)
return nla_nest_end(skb, opts);

nla_put_failure:
return nla_nest_cancel(skb, opts);
nla_nest_cancel(skb, opts);
return -EMSGSIZE;
}

static int red_dump_stats(struct Qdisc *sch, struct gnet_dump *d)
Expand Down
12 changes: 8 additions & 4 deletions net/wireless/nl80211.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,8 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
return genlmsg_end(msg, hdr);

nla_put_failure:
return genlmsg_cancel(msg, hdr);
genlmsg_cancel(msg, hdr);
return -EMSGSIZE;
}

static int nl80211_dump_wiphy(struct sk_buff *skb, struct netlink_callback *cb)
Expand Down Expand Up @@ -273,7 +274,8 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 pid, u32 seq, int flags,
return genlmsg_end(msg, hdr);

nla_put_failure:
return genlmsg_cancel(msg, hdr);
genlmsg_cancel(msg, hdr);
return -EMSGSIZE;
}

static int nl80211_dump_interface(struct sk_buff *skb, struct netlink_callback *cb)
Expand Down Expand Up @@ -928,7 +930,8 @@ static int nl80211_send_station(struct sk_buff *msg, u32 pid, u32 seq,
return genlmsg_end(msg, hdr);

nla_put_failure:
return genlmsg_cancel(msg, hdr);
genlmsg_cancel(msg, hdr);
return -EMSGSIZE;
}

static int nl80211_dump_station(struct sk_buff *skb,
Expand Down Expand Up @@ -1267,7 +1270,8 @@ static int nl80211_send_mpath(struct sk_buff *msg, u32 pid, u32 seq,
return genlmsg_end(msg, hdr);

nla_put_failure:
return genlmsg_cancel(msg, hdr);
genlmsg_cancel(msg, hdr);
return -EMSGSIZE;
}

static int nl80211_dump_mpath(struct sk_buff *skb,
Expand Down

0 comments on commit bc3ed28

Please sign in to comment.