diff options
Diffstat (limited to 'net/netlink/attr.c')
-rw-r--r-- | net/netlink/attr.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/net/netlink/attr.c b/net/netlink/attr.c index feb326f4a752..2d106cfe1d27 100644 --- a/net/netlink/attr.c +++ b/net/netlink/attr.c | |||
@@ -132,6 +132,7 @@ errout: | |||
132 | * @maxtype: maximum attribute type to be expected | 132 | * @maxtype: maximum attribute type to be expected |
133 | * @head: head of attribute stream | 133 | * @head: head of attribute stream |
134 | * @len: length of attribute stream | 134 | * @len: length of attribute stream |
135 | * @policy: validation policy | ||
135 | * | 136 | * |
136 | * Parses a stream of attributes and stores a pointer to each attribute in | 137 | * Parses a stream of attributes and stores a pointer to each attribute in |
137 | * the tb array accessable via the attribute type. Attributes with a type | 138 | * the tb array accessable via the attribute type. Attributes with a type |
@@ -194,7 +195,7 @@ struct nlattr *nla_find(struct nlattr *head, int len, int attrtype) | |||
194 | /** | 195 | /** |
195 | * nla_strlcpy - Copy string attribute payload into a sized buffer | 196 | * nla_strlcpy - Copy string attribute payload into a sized buffer |
196 | * @dst: where to copy the string to | 197 | * @dst: where to copy the string to |
197 | * @src: attribute to copy the string from | 198 | * @nla: attribute to copy the string from |
198 | * @dstsize: size of destination buffer | 199 | * @dstsize: size of destination buffer |
199 | * | 200 | * |
200 | * Copies at most dstsize - 1 bytes into the destination buffer. | 201 | * Copies at most dstsize - 1 bytes into the destination buffer. |
@@ -340,9 +341,9 @@ struct nlattr *nla_reserve(struct sk_buff *skb, int attrtype, int attrlen) | |||
340 | } | 341 | } |
341 | 342 | ||
342 | /** | 343 | /** |
343 | * nla_reserve - reserve room for attribute without header | 344 | * nla_reserve_nohdr - reserve room for attribute without header |
344 | * @skb: socket buffer to reserve room on | 345 | * @skb: socket buffer to reserve room on |
345 | * @len: length of attribute payload | 346 | * @attrlen: length of attribute payload |
346 | * | 347 | * |
347 | * Reserves room for attribute payload without a header. | 348 | * Reserves room for attribute payload without a header. |
348 | * | 349 | * |
@@ -400,13 +401,13 @@ void __nla_put_nohdr(struct sk_buff *skb, int attrlen, const void *data) | |||
400 | * @attrlen: length of attribute payload | 401 | * @attrlen: length of attribute payload |
401 | * @data: head of attribute payload | 402 | * @data: head of attribute payload |
402 | * | 403 | * |
403 | * Returns -1 if the tailroom of the skb is insufficient to store | 404 | * Returns -EMSGSIZE if the tailroom of the skb is insufficient to store |
404 | * the attribute header and payload. | 405 | * the attribute header and payload. |
405 | */ | 406 | */ |
406 | int nla_put(struct sk_buff *skb, int attrtype, int attrlen, const void *data) | 407 | int nla_put(struct sk_buff *skb, int attrtype, int attrlen, const void *data) |
407 | { | 408 | { |
408 | if (unlikely(skb_tailroom(skb) < nla_total_size(attrlen))) | 409 | if (unlikely(skb_tailroom(skb) < nla_total_size(attrlen))) |
409 | return -1; | 410 | return -EMSGSIZE; |
410 | 411 | ||
411 | __nla_put(skb, attrtype, attrlen, data); | 412 | __nla_put(skb, attrtype, attrlen, data); |
412 | return 0; | 413 | return 0; |
@@ -418,13 +419,13 @@ int nla_put(struct sk_buff *skb, int attrtype, int attrlen, const void *data) | |||
418 | * @attrlen: length of attribute payload | 419 | * @attrlen: length of attribute payload |
419 | * @data: head of attribute payload | 420 | * @data: head of attribute payload |
420 | * | 421 | * |
421 | * Returns -1 if the tailroom of the skb is insufficient to store | 422 | * Returns -EMSGSIZE if the tailroom of the skb is insufficient to store |
422 | * the attribute payload. | 423 | * the attribute payload. |
423 | */ | 424 | */ |
424 | int nla_put_nohdr(struct sk_buff *skb, int attrlen, const void *data) | 425 | int nla_put_nohdr(struct sk_buff *skb, int attrlen, const void *data) |
425 | { | 426 | { |
426 | if (unlikely(skb_tailroom(skb) < NLA_ALIGN(attrlen))) | 427 | if (unlikely(skb_tailroom(skb) < NLA_ALIGN(attrlen))) |
427 | return -1; | 428 | return -EMSGSIZE; |
428 | 429 | ||
429 | __nla_put_nohdr(skb, attrlen, data); | 430 | __nla_put_nohdr(skb, attrlen, data); |
430 | return 0; | 431 | return 0; |
@@ -436,13 +437,13 @@ int nla_put_nohdr(struct sk_buff *skb, int attrlen, const void *data) | |||
436 | * @attrlen: length of attribute payload | 437 | * @attrlen: length of attribute payload |
437 | * @data: head of attribute payload | 438 | * @data: head of attribute payload |
438 | * | 439 | * |
439 | * Returns -1 if the tailroom of the skb is insufficient to store | 440 | * Returns -EMSGSIZE if the tailroom of the skb is insufficient to store |
440 | * the attribute payload. | 441 | * the attribute payload. |
441 | */ | 442 | */ |
442 | int nla_append(struct sk_buff *skb, int attrlen, const void *data) | 443 | int nla_append(struct sk_buff *skb, int attrlen, const void *data) |
443 | { | 444 | { |
444 | if (unlikely(skb_tailroom(skb) < NLA_ALIGN(attrlen))) | 445 | if (unlikely(skb_tailroom(skb) < NLA_ALIGN(attrlen))) |
445 | return -1; | 446 | return -EMSGSIZE; |
446 | 447 | ||
447 | memcpy(skb_put(skb, attrlen), data, attrlen); | 448 | memcpy(skb_put(skb, attrlen), data, attrlen); |
448 | return 0; | 449 | return 0; |