x86/resctrl: fix a NULL vs IS_ERR() static checker warning
Subsystems (3)
PATCH v2 1/1 x86/resctrl: fix a NULL vs IS_ERR() static checker warning
The callers don't expect *d_cdp to be set to an error pointer, they only check for NULL. This leads to a static checker warning:
arch/x86/kernel/cpu/resctrl/rdtgroup.c:2648 __init_one_rdt_domain()
warn: 'd_cdp' could be an error pointer
This would not trigger a bug in this specific case because __init_one_rdt_domain() calls it with a valid domain that would not have a negative id and thus not trigger the return of the ERR_PTR(). If this was a negative domain id then the call to rdt_find_domain() in domain_add_cpu() would have returned the ERR_PTR() much earlier and the creation of the domain with an invalid id would have been prevented.
Even though a bug is not triggered currently the right and safe thing to do is to set the pointer to NULL because that is what can be checked for when the caller is handling the CDP and non-CDP cases.
---
v2: improve commit message with extra information from the maintainer
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kernel/cpu/resctrl/rdtgroup.c +1 -0
@@ -1117,6 +1117,7 @@ static int rdt_cdp_peer_get(struct rdt_resource *r, struct rdt_domain *d, _d_cdp =rdt_find_domain (_r_cdp, d->id,NULL );if (WARN_ON (IS_ERR_OR_NULL (_d_cdp))) { _r_cdp =NULL ; + _d_cdp =NULL ; ret = -EINVAL ; }
Signature · 1 line
2.26.2
Quoted 13 lines · Dan Carpenter
The callers don't expect
*d_cdpto be set to an error pointer, they only check for NULL. This leads to a static checker warning:
arch/x86/kernel/cpu/resctrl/rdtgroup.c:2648__init_one_rdt_domain()
warn: 'd_cdp' could be an error pointerThis would not trigger a bug in this specific case because
__init_one_rdt_domain()calls it with a valid domain that would not have a negative id and thus not trigger the return of theERR_PTR(). If this was a negative domain id then the call tordt_find_domain()indomain_add_cpu()would have returned theERR_PTR()much earlier and the creation of the domain with an invalid id would have been prevented.
Quoted 5 lines
Even though a bug is not triggered currently the right and safe thing to do is to set the pointer to NULL because that is what can be checked for when the caller is handling the CDP and non-CDP cases.
Fixes 52eb74339a62 ("x86/resctrl: Fix rdt_find_domain() return value and checks")
[tip: x86/urgent] x86/resctrl: Fix a NULL vs IS_ERR() static checker warning in rdt_cdp_peer_get()
In reply to Dan CarpenterThe following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: cc5277fe66cf3ad68f41f1c539b2ef0d5e432974 Gitweb: https://git.kernel.org/tip/cc5277fe66cf3ad68f41f1c539b2ef0d5e432974 Author: Dan Carpenter <[email protected]> AuthorDate: Tue, 02 Jun 2020 22:36:11 +03:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Wed, 17 Jun 2020 12:18:34 +02:00
x86/resctrl: Fix a NULL vs IS_ERR() static checker warning in rdt_cdp_peer_get()
The callers don't expect *d_cdp to be set to an error pointer, they only check for NULL. This leads to a static checker warning:
arch/x86/kernel/cpu/resctrl/rdtgroup.c:2648 __init_one_rdt_domain()
warn: 'd_cdp' could be an error pointer
This would not trigger a bug in this specific case because __init_one_rdt_domain() calls it with a valid domain that would not have a negative id and thus not trigger the return of the ERR_PTR(). If this was a negative domain id then the call to rdt_find_domain() in domain_add_cpu() would have returned the ERR_PTR() much earlier and the creation of the domain with an invalid id would have been prevented.
Even though a bug is not triggered currently the right and safe thing to do is to set the pointer to NULL because that is what can be checked for when the caller is handling the CDP and non-CDP cases.
--- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kernel/cpu/resctrl/rdtgroup.c +1 -0
@@ -1117,6 +1117,7 @@ static int rdt_cdp_peer_get(struct rdt_resource *r, struct rdt_domain *d, _d_cdp =rdt_find_domain (_r_cdp, d->id,NULL );if (WARN_ON (IS_ERR_OR_NULL (_d_cdp))) { _r_cdp =NULL ; + _d_cdp =NULL ; ret = -EINVAL ; }