On Sun, Mar 26, 2017 at 04:45:00AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> This will allow to let the user enter a password before booting more safe
> than just a 'y'
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
> ---
> common/boot_verify.c | 10 ++++++++++
> common/password.c | 18 ++++++++++++++++++
> include/password.h | 6 ++++++
> 3 files changed, 34 insertions(+)
>
> diff --git a/common/boot_verify.c b/common/boot_verify.c
> index 07ae07e16..2faa8d56c 100644
> --- a/common/boot_verify.c
> +++ b/common/boot_verify.c
> @@ -10,6 +10,7 @@
> #include <globalvar.h>
> #include <magicvar.h>
> #include <init.h>
> +#include <password.h>
>
> static unsigned int boot_verify_confirm_timeout = 10;
> static enum boot_verify boot_verify_mode = BOOT_VERIFY_HASH;
> @@ -63,6 +64,14 @@ int boot_can_start_unsigned(void)
>
> printf("Are you sure you wish to run an unsigned binary\n");
> printf("in a secure environment?\n");
> + if (IS_ENABLED(CONFIG_PASSWORD)) {
> + printf("enter password to confirm\n");
This needs to be in request_password(), otherwise you may end up
printing this without a password ever being asked for.
> + ret = request_password(timeout);
> + if (ret != -ENOTSUPP)
> + return -ESECVIOLATION;
Shouldn't you continue when the correct password is entered?
> +
> + }
> +
> printf("press y to confirm\n");
>
> ret = console_countdown(timeout, CONSOLE_COUNTDOWN_ANYKEY, &c);
> @@ -72,6 +81,7 @@ int boot_can_start_unsigned(void)
> return c == 'y' ? 0 : -ESECVIOLATION;
> }
>
> +
> static int init_boot_verify(void)
> {
> int size;
> diff --git a/common/password.c b/common/password.c
> index d52b746f0..1147111cd 100644
> --- a/common/password.c
> +++ b/common/password.c
> @@ -435,6 +435,24 @@ void login(void)
> }
> }
>
> +int request_password(int timeout)
> +{
> + unsigned char passwd[PASSWD_MAX_LENGTH];
> + int ret;
> +
> + if (!is_passwd_default_enable() && !is_passwd_env_enable())
> + return -ENOTSUPP;
> +
> + ret = password(passwd, PASSWD_MAX_LENGTH, LOGIN_MODE, timeout);
> + if (ret < 0)
> + return ret;
> +
> + if (check_passwd(passwd, ret) == 1)
> + return 0;
> +
> + return -EINVAL;
> +}
> +
> static int login_global_init(void)
> {
> login_fail_command = xstrdup("boot");
> diff --git a/include/password.h b/include/password.h
> index 8b9961815..5e8964929 100644
> --- a/include/password.h
> +++ b/include/password.h
> @@ -31,10 +31,16 @@ int set_env_passwd(unsigned char *passwd, size_t length);
>
> #ifdef CONFIG_PASSWORD
> void login(void);
> +int request_password(int timeout);
> #else
> static inline void login(void)
> {
> }
> +
> +static inline int request_password(int timeout)
> +{
> + return 0;
> +}
You have a static inline wrapper for request_password(), why not use it
and drop the IS_ENABLED(CONFIG_PASSWORD) above when you use it?
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
