[PATCH 2/2] environment: Do not use environment when overlapping with other partitions

Andrey Smirnov andrew.smirnov at gmail.com
Mon Sep 24 06:23:02 PDT 2018


On Fri, Sep 21, 2018 at 5:44 AM Sascha Hauer <s.hauer at pengutronix.de> wrote:
>
> Environment partitions are usually specified with their hardcoded offset
> and size, either in the device tree or the board file. These partitions
> potentially overlap with other partitions read from the partition table.
> Overlapping partitions for sure have bad effects. Be more friendly to our
> users and warn them when such a situation occurs and stop using that
> partition for storing the environment.
>
> Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
> ---
>  common/startup.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
>  include/common.h | 10 ++++++++++
>  2 files changed, 57 insertions(+), 1 deletion(-)
>
> diff --git a/common/startup.c b/common/startup.c
> index 8553849cb3..f6bb1f1947 100644
> --- a/common/startup.c
> +++ b/common/startup.c
> @@ -73,16 +73,62 @@ fs_initcall(mount_root);
>  #endif
>
>  #ifdef CONFIG_ENV_HANDLING
> +static int check_overlap(const char *path)
> +{
> +       struct cdev *cenv, *cdisk, *cpart;
> +
> +       if (strncmp(path, "/dev/", 5))
> +               return 0;
> +
> +       path = devpath_to_name(path);

Minor suggestions: you can drop the strcmp above by relying on the
fact that, if argument given to devpath_to_name() does not have
"/dev/" in front of it, the return value would be that same as the
argument. IOW, replace the above with:

name = devpath_to_name(path);

if (name == path) /* No "/dev" in front */
    return 0;

Thanks,
Andrey Smirnov



More information about the barebox mailing list