Re: [yocto] [meta-security][PATCH 1/3] initramfs-framework/dmverity: add retry loop for slow boot devices

["akuster" <akuster808@gmail.com>]

On 10/1/20 7:53 PM, Naveen Saini wrote:
> Detection of USB devices by the kernel is slow enough. We need to
> keep trying for a while (default: 5s seconds, controlled by roottimeout=<seconds>)
> and sleep between each attempt (default: one second, rootdelay=<seconds>).
>
> Fix is based on https://git.yoctoproject.org/cgit.cgi/poky/commit/meta/recipes-core/initrdscripts/initramfs-framework/rootfs?id=ee6a6c3461694ce09789bf4d852cea2e22fc95e4
>
> Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
> ---
>  .../initramfs-framework/dmverity              | 64 +++++++++++--------
>  1 file changed, 37 insertions(+), 27 deletions(-)

series merge.

thanks
>
> diff --git a/recipes-core/initrdscripts/initramfs-framework/dmverity b/recipes-core/initrdscripts/initramfs-framework/dmverity
> index bb07aab..888052c 100644
> --- a/recipes-core/initrdscripts/initramfs-framework/dmverity
> +++ b/recipes-core/initrdscripts/initramfs-framework/dmverity
> @@ -10,33 +10,43 @@ dmverity_run() {
>  
>      . /usr/share/misc/dm-verity.env
>  
> -    case "${bootparam_root}" in
> -        ID=*)
> -            RDEV="$(realpath /dev/disk/by-id/${bootparam_root#ID=})"
> -            ;;
> -        LABEL=*)
> -            RDEV="$(realpath /dev/disk/by-label/${bootparam_root#LABEL=})"
> -            ;;
> -        PARTLABEL=*)
> -            RDEV="$(realpath /dev/disk/by-partlabel/${bootparam_root#PARTLABEL=})"
> -            ;;
> -        PARTUUID=*)
> -            RDEV="$(realpath /dev/disk/by-partuuid/${bootparam_root#PARTUUID=})"
> -            ;;
> -        PATH=*)
> -            RDEV="$(realpath /dev/disk/by-path/${bootparam_root#PATH=})"
> -            ;;
> -        UUID=*)
> -            RDEV="$(realpath /dev/disk/by-uuid/${bootparam_root#UUID=})"
> -            ;;
> -        *)
> -            RDEV="${bootparam_root}"
> -    esac
> -
> -    if ! [ -b "${RDEV}" ]; then
> -        echo "Root device resolution failed"
> -        exit 1
> -    fi
> +    C=0
> +    delay=${bootparam_rootdelay:-1}
> +    timeout=${bootparam_roottimeout:-5}
> +    RDEV="$(realpath /dev/disk/by-partuuid/${bootparam_root#PARTUUID=})"
> +    while [ ! -b "${RDEV}" ]; do
> +        if [ $(( $C * $delay )) -gt $timeout ]; then
> +            fatal "Root device resolution failed"
> +            exit 1
> +        fi
> +
> +        case "${bootparam_root}" in
> +            ID=*)
> +                RDEV="$(realpath /dev/disk/by-id/${bootparam_root#ID=})"
> +                ;;
> +            LABEL=*)
> +                RDEV="$(realpath /dev/disk/by-label/${bootparam_root#LABEL=})"
> +                ;;
> +            PARTLABEL=*)
> +                RDEV="$(realpath /dev/disk/by-partlabel/${bootparam_root#PARTLABEL=})"
> +                ;;
> +            PARTUUID=*)
> +                RDEV="$(realpath /dev/disk/by-partuuid/${bootparam_root#PARTUUID=})"
> +                ;;
> +            PATH=*)
> +                RDEV="$(realpath /dev/disk/by-path/${bootparam_root#PATH=})"
> +                ;;
> +            UUID=*)
> +                RDEV="$(realpath /dev/disk/by-uuid/${bootparam_root#UUID=})"
> +                ;;
> +            *)
> +                RDEV="${bootparam_root}"
> +        esac
> +        debug "Sleeping for $delay second(s) to wait root to settle..."
> +        sleep $delay
> +        C=$(( $C + 1 ))
> +
> +    done
>  
>      veritysetup \
>          --data-block-size=1024 \
>
> 
>