public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Kees Cook <keescook@chromium.org>
To: Raul E Rangel <rrangel@chromium.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Arnd Bergmann <arnd@arndb.de>,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] lkdtm/bugs: fix build error in lkdtm_EXHAUST_STACK
Date: Wed, 28 Aug 2019 13:29:25 -0700	[thread overview]
Message-ID: <201908281328.EF648562@keescook> (raw)
In-Reply-To: <20190827173619.170065-1-rrangel@chromium.org>

On Tue, Aug 27, 2019 at 11:36:19AM -0600, Raul E Rangel wrote:
> lkdtm/bugs.c:94:2: error: format '%d' expects argument of type 'int', but argument 2 has type 'long unsigned int' [-Werror=format=]
>   pr_info("Calling function with %d frame size to depth %d ...\n",
>   ^
> THREAD_SIZE is defined as a unsigned long, cast CONFIG_FRAME_WARN to
> unsigned long as well.
> 
> Fixes: 24cccab42c419 ("lkdtm/bugs: Adjust recursion test to avoid elision")
> Signed-off-by: Raul E Rangel <rrangel@chromium.org>

Thanks for the update! (Greg, can you take this instead?)

Acked-by: Kees Cook <keescook@chromium.org>

-Kees

> ---
> 
> Changes in v2:
> - Correctly cast CONFIG_FRAME_WARN so the type is consistent.
> 
>  drivers/misc/lkdtm/bugs.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/misc/lkdtm/bugs.c b/drivers/misc/lkdtm/bugs.c
> index 1606658b9b7e..24245ccdba72 100644
> --- a/drivers/misc/lkdtm/bugs.c
> +++ b/drivers/misc/lkdtm/bugs.c
> @@ -22,7 +22,7 @@ struct lkdtm_list {
>   * recurse past the end of THREAD_SIZE by default.
>   */
>  #if defined(CONFIG_FRAME_WARN) && (CONFIG_FRAME_WARN > 0)
> -#define REC_STACK_SIZE (CONFIG_FRAME_WARN / 2)
> +#define REC_STACK_SIZE (_AC(CONFIG_FRAME_WARN, UL) / 2)
>  #else
>  #define REC_STACK_SIZE (THREAD_SIZE / 8)
>  #endif
> @@ -91,7 +91,7 @@ void lkdtm_LOOP(void)
>  
>  void lkdtm_EXHAUST_STACK(void)
>  {
> -	pr_info("Calling function with %d frame size to depth %d ...\n",
> +	pr_info("Calling function with %lu frame size to depth %d ...\n",
>  		REC_STACK_SIZE, recur_count);
>  	recursive_loop(recur_count);
>  	pr_info("FAIL: survived without exhausting stack?!\n");
> -- 
> 2.23.0.187.g17f5b7556c-goog
> 

-- 
Kees Cook

      reply	other threads:[~2019-08-28 20:29 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-27 17:36 [PATCH v2] lkdtm/bugs: fix build error in lkdtm_EXHAUST_STACK Raul E Rangel
2019-08-28 20:29 ` Kees Cook [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201908281328.EF648562@keescook \
    --to=keescook@chromium.org \
    --cc=arnd@arndb.de \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rrangel@chromium.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox