* [PATCH] pwm: Add missing "CONFIG_" prefix @ 2020-06-03 22:40 Kees Cook 2020-06-03 23:04 ` Joe Perches ` (2 more replies) 0 siblings, 3 replies; 7+ messages in thread From: Kees Cook @ 2020-06-03 22:40 UTC (permalink / raw) To: Uwe Kleine-König, Thierry Reding; +Cc: linux-kernel, linux-pwm The IS_ENABLED() use was missing the CONFIG_ prefix which would have lead to skipping this code. Fixes: 3ad1f3a33286 ("pwm: Implement some checks for lowlevel drivers") Signed-off-by: Kees Cook <keescook@chromium.org> --- drivers/pwm/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index 9973c442b455..6b3cbc0490c6 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -121,7 +121,7 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label) pwm->chip->ops->get_state(pwm->chip, pwm, &pwm->state); trace_pwm_get(pwm, &pwm->state); - if (IS_ENABLED(PWM_DEBUG)) + if (IS_ENABLED(CONFIG_PWM_DEBUG)) pwm->last = pwm->state; } -- 2.25.1 -- Kees Cook ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] pwm: Add missing "CONFIG_" prefix 2020-06-03 22:40 [PATCH] pwm: Add missing "CONFIG_" prefix Kees Cook @ 2020-06-03 23:04 ` Joe Perches 2020-06-03 23:38 ` Kees Cook 2020-06-04 21:52 ` Kees Cook 2020-06-04 14:43 ` Uwe Kleine-König 2020-06-04 17:16 ` Thierry Reding 2 siblings, 2 replies; 7+ messages in thread From: Joe Perches @ 2020-06-03 23:04 UTC (permalink / raw) To: Kees Cook, Uwe Kleine-König, Thierry Reding Cc: linux-kernel, linux-pwm, Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras, linuxppc-dev On Wed, 2020-06-03 at 15:40 -0700, Kees Cook wrote: > The IS_ENABLED() use was missing the CONFIG_ prefix which would have > lead to skipping this code. > > Fixes: 3ad1f3a33286 ("pwm: Implement some checks for lowlevel drivers") > Signed-off-by: Kees Cook <keescook@chromium.org> > --- > drivers/pwm/core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c > index 9973c442b455..6b3cbc0490c6 100644 > --- a/drivers/pwm/core.c > +++ b/drivers/pwm/core.c > @@ -121,7 +121,7 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label) > pwm->chip->ops->get_state(pwm->chip, pwm, &pwm->state); > trace_pwm_get(pwm, &pwm->state); > > - if (IS_ENABLED(PWM_DEBUG)) > + if (IS_ENABLED(CONFIG_PWM_DEBUG)) > pwm->last = pwm->state; > } > > -- > 2.25.1 > more odd uses (mostly in comments) $ git grep -P -oh '\bIS_ENABLED\s*\(\s*\w+\s*\)'| \ sed -r 's/\s+//g'| \ grep -v '(CONFIG_' | \ sort | uniq -c | sort -rn 7 IS_ENABLED(DEBUG) 4 IS_ENABLED(DRM_I915_SELFTEST) 4 IS_ENABLED(cfg) 2 IS_ENABLED(opt_name) 2 IS_ENABLED(DEBUG_PRINT_TRIE_GRAPHVIZ) 2 IS_ENABLED(config) 2 IS_ENABLED(cond) 2 IS_ENABLED(__BIG_ENDIAN) 1 IS_ENABLED(x) 1 IS_ENABLED(STRICT_KERNEL_RWX) 1 IS_ENABLED(PWM_DEBUG) 1 IS_ENABLED(option) 1 IS_ENABLED(ETHTOOL_NETLINK) 1 IS_ENABLED(DEBUG_RANDOM_TRIE) 1 IS_ENABLED(DEBUG_CHACHA20POLY1305_SLOW_CHUNK_TEST) STRICT_KERNEL_RWX is misused here in ppc --- Fix pr_warn without newline too. arch/powerpc/mm/book3s64/hash_utils.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c index 51e3c15f7aff..dd60c5f2b991 100644 --- a/arch/powerpc/mm/book3s64/hash_utils.c +++ b/arch/powerpc/mm/book3s64/hash_utils.c @@ -660,11 +660,10 @@ static void __init htab_init_page_sizes(void) * Pick a size for the linear mapping. Currently, we only * support 16M, 1M and 4K which is the default */ - if (IS_ENABLED(STRICT_KERNEL_RWX) && + if (IS_ENABLED(CONFIG_STRICT_KERNEL_RWX) && (unsigned long)_stext % 0x1000000) { if (mmu_psize_defs[MMU_PAGE_16M].shift) - pr_warn("Kernel not 16M aligned, " - "disabling 16M linear map alignment"); + pr_warn("Kernel not 16M aligned, disabling 16M linear map alignment\n"); aligned = false; } ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] pwm: Add missing "CONFIG_" prefix 2020-06-03 23:04 ` Joe Perches @ 2020-06-03 23:38 ` Kees Cook 2020-06-04 21:52 ` Kees Cook 1 sibling, 0 replies; 7+ messages in thread From: Kees Cook @ 2020-06-03 23:38 UTC (permalink / raw) To: Joe Perches Cc: Uwe Kleine-König, Thierry Reding, linux-kernel, linux-pwm, Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras, linuxppc-dev On Wed, Jun 03, 2020 at 04:04:31PM -0700, Joe Perches wrote: > more odd uses (mostly in comments) > > $ git grep -P -oh '\bIS_ENABLED\s*\(\s*\w+\s*\)'| \ > sed -r 's/\s+//g'| \ > grep -v '(CONFIG_' | \ > sort | uniq -c | sort -rn I think a missed a bunch because my grep was messy. :) This is much easier to scan. > 7 IS_ENABLED(DEBUG) > 4 IS_ENABLED(cfg) > 2 IS_ENABLED(opt_name) > 2 IS_ENABLED(DEBUG_PRINT_TRIE_GRAPHVIZ) > 2 IS_ENABLED(config) > 2 IS_ENABLED(cond) > 2 IS_ENABLED(__BIG_ENDIAN) > 1 IS_ENABLED(x) > 1 IS_ENABLED(PWM_DEBUG) > 1 IS_ENABLED(option) > 1 IS_ENABLED(DEBUG_RANDOM_TRIE) > 1 IS_ENABLED(DEBUG_CHACHA20POLY1305_SLOW_CHUNK_TEST) These seem to be "as expected". > 4 IS_ENABLED(DRM_I915_SELFTEST) > 1 IS_ENABLED(STRICT_KERNEL_RWX) > 1 IS_ENABLED(ETHTOOL_NETLINK) But these are not. > > STRICT_KERNEL_RWX is misused here in ppc > > --- > > Fix pr_warn without newline too. > > arch/powerpc/mm/book3s64/hash_utils.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c > index 51e3c15f7aff..dd60c5f2b991 100644 > --- a/arch/powerpc/mm/book3s64/hash_utils.c > +++ b/arch/powerpc/mm/book3s64/hash_utils.c > @@ -660,11 +660,10 @@ static void __init htab_init_page_sizes(void) > * Pick a size for the linear mapping. Currently, we only > * support 16M, 1M and 4K which is the default > */ > - if (IS_ENABLED(STRICT_KERNEL_RWX) && > + if (IS_ENABLED(CONFIG_STRICT_KERNEL_RWX) && > (unsigned long)_stext % 0x1000000) { > if (mmu_psize_defs[MMU_PAGE_16M].shift) > - pr_warn("Kernel not 16M aligned, " > - "disabling 16M linear map alignment"); > + pr_warn("Kernel not 16M aligned, disabling 16M linear map alignment\n"); > aligned = false; > } Reviewed-by: Kees Cook <keescook@chromium.org> -- Kees Cook ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] pwm: Add missing "CONFIG_" prefix 2020-06-03 23:04 ` Joe Perches 2020-06-03 23:38 ` Kees Cook @ 2020-06-04 21:52 ` Kees Cook 2020-06-05 4:07 ` Joe Perches 1 sibling, 1 reply; 7+ messages in thread From: Kees Cook @ 2020-06-04 21:52 UTC (permalink / raw) To: Joe Perches Cc: Uwe Kleine-König, Thierry Reding, linux-kernel, linux-pwm, Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras, linuxppc-dev On Wed, Jun 03, 2020 at 04:04:31PM -0700, Joe Perches wrote: > On Wed, 2020-06-03 at 15:40 -0700, Kees Cook wrote: > > The IS_ENABLED() use was missing the CONFIG_ prefix which would have > > lead to skipping this code. > > > > Fixes: 3ad1f3a33286 ("pwm: Implement some checks for lowlevel drivers") > > Signed-off-by: Kees Cook <keescook@chromium.org> > > --- > > drivers/pwm/core.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c > > index 9973c442b455..6b3cbc0490c6 100644 > > --- a/drivers/pwm/core.c > > +++ b/drivers/pwm/core.c > > @@ -121,7 +121,7 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label) > > pwm->chip->ops->get_state(pwm->chip, pwm, &pwm->state); > > trace_pwm_get(pwm, &pwm->state); > > > > - if (IS_ENABLED(PWM_DEBUG)) > > + if (IS_ENABLED(CONFIG_PWM_DEBUG)) > > pwm->last = pwm->state; > > } > > > > -- > > 2.25.1 > > > > more odd uses (mostly in comments) > > $ git grep -P -oh '\bIS_ENABLED\s*\(\s*\w+\s*\)'| \ > sed -r 's/\s+//g'| \ > grep -v '(CONFIG_' | \ > sort | uniq -c | sort -rn > 7 IS_ENABLED(DEBUG) > 4 IS_ENABLED(DRM_I915_SELFTEST) > 4 IS_ENABLED(cfg) > 2 IS_ENABLED(opt_name) > 2 IS_ENABLED(DEBUG_PRINT_TRIE_GRAPHVIZ) > 2 IS_ENABLED(config) > 2 IS_ENABLED(cond) > 2 IS_ENABLED(__BIG_ENDIAN) > 1 IS_ENABLED(x) > 1 IS_ENABLED(STRICT_KERNEL_RWX) > 1 IS_ENABLED(PWM_DEBUG) > 1 IS_ENABLED(option) > 1 IS_ENABLED(ETHTOOL_NETLINK) > 1 IS_ENABLED(DEBUG_RANDOM_TRIE) > 1 IS_ENABLED(DEBUG_CHACHA20POLY1305_SLOW_CHUNK_TEST) > > STRICT_KERNEL_RWX is misused here in ppc > > --- > > Fix pr_warn without newline too. > > arch/powerpc/mm/book3s64/hash_utils.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c > index 51e3c15f7aff..dd60c5f2b991 100644 > --- a/arch/powerpc/mm/book3s64/hash_utils.c > +++ b/arch/powerpc/mm/book3s64/hash_utils.c > @@ -660,11 +660,10 @@ static void __init htab_init_page_sizes(void) > * Pick a size for the linear mapping. Currently, we only > * support 16M, 1M and 4K which is the default > */ > - if (IS_ENABLED(STRICT_KERNEL_RWX) && > + if (IS_ENABLED(CONFIG_STRICT_KERNEL_RWX) && > (unsigned long)_stext % 0x1000000) { > if (mmu_psize_defs[MMU_PAGE_16M].shift) > - pr_warn("Kernel not 16M aligned, " > - "disabling 16M linear map alignment"); > + pr_warn("Kernel not 16M aligned, disabling 16M linear map alignment\n"); > aligned = false; > } Joe, I was going to send all of the fixes for these issues, but your patch doesn't have a SoB. Shall I add one for the above patch? -- Kees Cook ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] pwm: Add missing "CONFIG_" prefix 2020-06-04 21:52 ` Kees Cook @ 2020-06-05 4:07 ` Joe Perches 0 siblings, 0 replies; 7+ messages in thread From: Joe Perches @ 2020-06-05 4:07 UTC (permalink / raw) To: Kees Cook Cc: Uwe Kleine-König, Thierry Reding, linux-kernel, linux-pwm, Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras, linuxppc-dev On Thu, 2020-06-04 at 14:52 -0700, Kees Cook wrote: > On Wed, Jun 03, 2020 at 04:04:31PM -0700, Joe Perches wrote: > > On Wed, 2020-06-03 at 15:40 -0700, Kees Cook wrote: > > > The IS_ENABLED() use was missing the CONFIG_ prefix which would have > > > lead to skipping this code. > > > > > > Fixes: 3ad1f3a33286 ("pwm: Implement some checks for lowlevel drivers") > > > Signed-off-by: Kees Cook <keescook@chromium.org> > > > --- > > > drivers/pwm/core.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c > > > index 9973c442b455..6b3cbc0490c6 100644 > > > --- a/drivers/pwm/core.c > > > +++ b/drivers/pwm/core.c > > > @@ -121,7 +121,7 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label) > > > pwm->chip->ops->get_state(pwm->chip, pwm, &pwm->state); > > > trace_pwm_get(pwm, &pwm->state); > > > > > > - if (IS_ENABLED(PWM_DEBUG)) > > > + if (IS_ENABLED(CONFIG_PWM_DEBUG)) > > > pwm->last = pwm->state; > > > } > > > > > > -- > > > 2.25.1 > > > > > > > more odd uses (mostly in comments) > > > > $ git grep -P -oh '\bIS_ENABLED\s*\(\s*\w+\s*\)'| \ > > sed -r 's/\s+//g'| \ > > grep -v '(CONFIG_' | \ > > sort | uniq -c | sort -rn > > 7 IS_ENABLED(DEBUG) > > 4 IS_ENABLED(DRM_I915_SELFTEST) > > 4 IS_ENABLED(cfg) > > 2 IS_ENABLED(opt_name) > > 2 IS_ENABLED(DEBUG_PRINT_TRIE_GRAPHVIZ) > > 2 IS_ENABLED(config) > > 2 IS_ENABLED(cond) > > 2 IS_ENABLED(__BIG_ENDIAN) > > 1 IS_ENABLED(x) > > 1 IS_ENABLED(STRICT_KERNEL_RWX) > > 1 IS_ENABLED(PWM_DEBUG) > > 1 IS_ENABLED(option) > > 1 IS_ENABLED(ETHTOOL_NETLINK) > > 1 IS_ENABLED(DEBUG_RANDOM_TRIE) > > 1 IS_ENABLED(DEBUG_CHACHA20POLY1305_SLOW_CHUNK_TEST) > > > > STRICT_KERNEL_RWX is misused here in ppc > > > > --- > > > > Fix pr_warn without newline too. > > > > arch/powerpc/mm/book3s64/hash_utils.c | 5 ++--- > > 1 file changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/arch/powerpc/mm/book3s64/hash_utils.c b/arch/powerpc/mm/book3s64/hash_utils.c > > index 51e3c15f7aff..dd60c5f2b991 100644 > > --- a/arch/powerpc/mm/book3s64/hash_utils.c > > +++ b/arch/powerpc/mm/book3s64/hash_utils.c > > @@ -660,11 +660,10 @@ static void __init htab_init_page_sizes(void) > > * Pick a size for the linear mapping. Currently, we only > > * support 16M, 1M and 4K which is the default > > */ > > - if (IS_ENABLED(STRICT_KERNEL_RWX) && > > + if (IS_ENABLED(CONFIG_STRICT_KERNEL_RWX) && > > (unsigned long)_stext % 0x1000000) { > > if (mmu_psize_defs[MMU_PAGE_16M].shift) > > - pr_warn("Kernel not 16M aligned, " > > - "disabling 16M linear map alignment"); > > + pr_warn("Kernel not 16M aligned, disabling 16M linear map alignment\n"); > > aligned = false; > > } > > Joe, I was going to send all of the fixes for these issues, but your > patch doesn't have a SoB. Shall I add one for the above patch? <shrug> sure if you want, or submit it yourself. My feeling about these types of changes is the maintainers of the subsystems, in this case ppc, should manage this themselves and shouldn't require anyone else to actually bother to send real patches. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] pwm: Add missing "CONFIG_" prefix 2020-06-03 22:40 [PATCH] pwm: Add missing "CONFIG_" prefix Kees Cook 2020-06-03 23:04 ` Joe Perches @ 2020-06-04 14:43 ` Uwe Kleine-König 2020-06-04 17:16 ` Thierry Reding 2 siblings, 0 replies; 7+ messages in thread From: Uwe Kleine-König @ 2020-06-04 14:43 UTC (permalink / raw) To: Kees Cook; +Cc: Thierry Reding, linux-kernel, linux-pwm On Wed, Jun 03, 2020 at 03:40:56PM -0700, Kees Cook wrote: > The IS_ENABLED() use was missing the CONFIG_ prefix which would have > lead to skipping this code. > > Fixes: 3ad1f3a33286 ("pwm: Implement some checks for lowlevel drivers") > Signed-off-by: Kees Cook <keescook@chromium.org> > --- > drivers/pwm/core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c > index 9973c442b455..6b3cbc0490c6 100644 > --- a/drivers/pwm/core.c > +++ b/drivers/pwm/core.c > @@ -121,7 +121,7 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label) > pwm->chip->ops->get_state(pwm->chip, pwm, &pwm->state); > trace_pwm_get(pwm, &pwm->state); > > - if (IS_ENABLED(PWM_DEBUG)) > + if (IS_ENABLED(CONFIG_PWM_DEBUG)) > pwm->last = pwm->state; Thanks Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | https://www.pengutronix.de/ | ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] pwm: Add missing "CONFIG_" prefix 2020-06-03 22:40 [PATCH] pwm: Add missing "CONFIG_" prefix Kees Cook 2020-06-03 23:04 ` Joe Perches 2020-06-04 14:43 ` Uwe Kleine-König @ 2020-06-04 17:16 ` Thierry Reding 2 siblings, 0 replies; 7+ messages in thread From: Thierry Reding @ 2020-06-04 17:16 UTC (permalink / raw) To: Kees Cook; +Cc: Uwe Kleine-König, linux-kernel, linux-pwm [-- Attachment #1: Type: text/plain, Size: 412 bytes --] On Wed, Jun 03, 2020 at 03:40:56PM -0700, Kees Cook wrote: > The IS_ENABLED() use was missing the CONFIG_ prefix which would have > lead to skipping this code. > > Fixes: 3ad1f3a33286 ("pwm: Implement some checks for lowlevel drivers") > Signed-off-by: Kees Cook <keescook@chromium.org> > --- > drivers/pwm/core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied, thanks. Thierry [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 833 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-06-05 4:07 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-06-03 22:40 [PATCH] pwm: Add missing "CONFIG_" prefix Kees Cook 2020-06-03 23:04 ` Joe Perches 2020-06-03 23:38 ` Kees Cook 2020-06-04 21:52 ` Kees Cook 2020-06-05 4:07 ` Joe Perches 2020-06-04 14:43 ` Uwe Kleine-König 2020-06-04 17:16 ` Thierry Reding
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).