| Message ID | b54ed5c5fd972a59afea3e1badfb36d86df68799.1607952208.git.mkubecek@suse.cz (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | efb796f5571f030743e1d9c662cdebdad724f8c5 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] ethtool: fix string set id check | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 1 this patch: 1 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 1 this patch: 1 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Mon, 14 Dec 2020 14:25:01 +0100 (CET) you wrote: > Syzbot reported a shift of a u32 by more than 31 in strset_parse_request() > which is undefined behavior. This is caused by range check of string set id > using variable ret (which is always 0 at this point) instead of id (string > set id from request). > > Fixes: 71921690f974 ("ethtool: provide string sets with STRSET_GET request") > Reported-by: syzbot+96523fb438937cd01220@syzkaller.appspotmail.com > Signed-off-by: Michal Kubecek <mkubecek@suse.cz> > > [...] Here is the summary with links: - [net] ethtool: fix string set id check https://git.kernel.org/netdev/net/c/efb796f5571f You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/net/ethtool/strset.c b/net/ethtool/strset.c index 0baad0ce1832..c3a5489964cd 100644 --- a/net/ethtool/strset.c +++ b/net/ethtool/strset.c @@ -182,7 +182,7 @@ static int strset_parse_request(struct ethnl_req_info *req_base, ret = strset_get_id(attr, &id, extack); if (ret < 0) return ret; - if (ret >= ETH_SS_COUNT) { + if (id >= ETH_SS_COUNT) { NL_SET_ERR_MSG_ATTR(extack, attr, "unknown string set id"); return -EOPNOTSUPP;
Syzbot reported a shift of a u32 by more than 31 in strset_parse_request() which is undefined behavior. This is caused by range check of string set id using variable ret (which is always 0 at this point) instead of id (string set id from request). Fixes: 71921690f974 ("ethtool: provide string sets with STRSET_GET request") Reported-by: syzbot+96523fb438937cd01220@syzkaller.appspotmail.com Signed-off-by: Michal Kubecek <mkubecek@suse.cz> --- net/ethtool/strset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)