mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
ethtool: count header size in reply size estimate
As ethnl_request_ops::reply_size handlers do not include common header
size into calculated/estimated reply size, it needs to be added in
ethnl_default_doit() and ethnl_default_notify() before allocating the
message. On the other hand, strset_reply_size() should not add common
header size.
Fixes: 728480f124
("ethtool: default handlers for GET requests")
Reported-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
d69100b8ee
commit
7c87e32d2e
@ -342,7 +342,7 @@ static int ethnl_default_doit(struct sk_buff *skb, struct genl_info *info)
|
|||||||
ret = ops->reply_size(req_info, reply_data);
|
ret = ops->reply_size(req_info, reply_data);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto err_cleanup;
|
goto err_cleanup;
|
||||||
reply_len = ret;
|
reply_len = ret + ethnl_reply_header_size();
|
||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
rskb = ethnl_reply_init(reply_len, req_info->dev, ops->reply_cmd,
|
rskb = ethnl_reply_init(reply_len, req_info->dev, ops->reply_cmd,
|
||||||
ops->hdr_attr, info, &reply_payload);
|
ops->hdr_attr, info, &reply_payload);
|
||||||
@ -588,7 +588,7 @@ static void ethnl_default_notify(struct net_device *dev, unsigned int cmd,
|
|||||||
ret = ops->reply_size(req_info, reply_data);
|
ret = ops->reply_size(req_info, reply_data);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto err_cleanup;
|
goto err_cleanup;
|
||||||
reply_len = ret;
|
reply_len = ret + ethnl_reply_header_size();
|
||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
skb = genlmsg_new(reply_len, GFP_KERNEL);
|
skb = genlmsg_new(reply_len, GFP_KERNEL);
|
||||||
if (!skb)
|
if (!skb)
|
||||||
|
@ -324,7 +324,6 @@ static int strset_reply_size(const struct ethnl_req_info *req_base,
|
|||||||
int len = 0;
|
int len = 0;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
len += ethnl_reply_header_size();
|
|
||||||
for (i = 0; i < ETH_SS_COUNT; i++) {
|
for (i = 0; i < ETH_SS_COUNT; i++) {
|
||||||
const struct strset_info *set_info = &data->sets[i];
|
const struct strset_info *set_info = &data->sets[i];
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user