diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2011-09-06 09:52:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-09-16 19:25:10 -0400 |
commit | 473e64ee4603671efa1e0785418e56e9ffdfc47b (patch) | |
tree | ff40ee34b7ac14c920993bb655527338419dea63 /include/linux/ethtool.h | |
parent | 815c7db5c809ea3d5735de3131ecdf758b0e14ff (diff) |
ethtool: Update ethtool_rxnfc::rule_cnt on return from ETHTOOL_GRXCLSRLALL
A user-space process must use ETHTOOL_GRXCLSRLCNT to find the number
of classification rules, then allocate a buffer of the right size,
then use ETHTOOL_GRXCLSRLALL to fill the buffer. If some other
process inserts or deletes a rule between those two operations,
the user buffer might turn out to be the wrong size.
If it's too small, the return value will be -EMSGSIZE. But if it's
too large, there is no indication of this. Fix this by updating
the rule_cnt field on return.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/ethtool.h')
-rw-r--r-- | include/linux/ethtool.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index 5d4a06accd82..45f00b61c096 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h | |||
@@ -496,9 +496,9 @@ struct ethtool_rx_flow_spec { | |||
496 | * | 496 | * |
497 | * For %ETHTOOL_GRXCLSRLALL, @rule_cnt specifies the array size of the | 497 | * For %ETHTOOL_GRXCLSRLALL, @rule_cnt specifies the array size of the |
498 | * user buffer for @rule_locs on entry. On return, @data is the size | 498 | * user buffer for @rule_locs on entry. On return, @data is the size |
499 | * of the rule table and @rule_locs contains the locations of the | 499 | * of the rule table, @rule_cnt is the number of defined rules, and |
500 | * defined rules. Drivers must use the second parameter to get_rxnfc() | 500 | * @rule_locs contains the locations of the defined rules. Drivers |
501 | * instead of @rule_locs. | 501 | * must use the second parameter to get_rxnfc() instead of @rule_locs. |
502 | * | 502 | * |
503 | * For %ETHTOOL_SRXCLSRLINS, @fs specifies the rule to add or update. | 503 | * For %ETHTOOL_SRXCLSRLINS, @fs specifies the rule to add or update. |
504 | * @fs.@location specifies the location to use and must not be ignored. | 504 | * @fs.@location specifies the location to use and must not be ignored. |