UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ethtool: add a stricter length check 

There has been a few errors in the ethtool reply size calculations,
most of those are hard to trigger during basic testing because of
skb size rounding up and netdev names being shorter than max.
Add a more precise check.

This change will affect the value of payload length displayed in
case of -EMSGSIZE but that should be okay, "payload length" isn't
a well defined term here.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
This commit is contained in:
Jakub Kicinski 2021-06-15 20:33:38 -07:00 committed by Jianping Liu
parent 6dbd5b7117
commit d1dc72a52e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/ethtool/netlink.c
View File

@ -305,9 +305,9 @@ static int ethnl_default_doit(struct sk_buff *skb, struct genl_info *info)
struct ethnl_req_info *req_info = NULL; struct ethnl_req_info *req_info = NULL;
const u8 cmd = info->genlhdr->cmd; const u8 cmd = info->genlhdr->cmd;
const struct ethnl_request_ops *ops; const struct ethnl_request_ops *ops;
int hdr_len, reply_len;
struct sk_buff *rskb; struct sk_buff *rskb;
void *reply_payload; void *reply_payload;
int reply_len;
int ret; int ret;
ops = ethnl_default_requests[cmd]; ops = ethnl_default_requests[cmd];
@ -336,15 +336,20 @@ 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 + ethnl_reply_header_size(); reply_len = ret;
ret = -ENOMEM; ret = -ENOMEM;
rskb = ethnl_reply_init(reply_len, req_info->dev, ops->reply_cmd, rskb = ethnl_reply_init(reply_len + ethnl_reply_header_size(),
req_info->dev, ops->reply_cmd,
ops->hdr_attr, info, &reply_payload); ops->hdr_attr, info, &reply_payload);
if (!rskb) if (!rskb)
goto err_cleanup; goto err_cleanup;
hdr_len = rskb->len;
ret = ops->fill_reply(rskb, req_info, reply_data); ret = ops->fill_reply(rskb, req_info, reply_data);
if (ret < 0) if (ret < 0)
goto err_msg; goto err_msg;
WARN_ONCE(rskb->len - hdr_len > reply_len,
"ethnl cmd %d: calculated reply length %d, but consumed %d\n",
cmd, reply_len, rskb->len - hdr_len);
if (ops->cleanup_data) if (ops->cleanup_data)
ops->cleanup_data(reply_data); ops->cleanup_data(reply_data);