From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E59A7C35254 for ; Mon, 17 Feb 2020 11:09:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B7CD220801 for ; Mon, 17 Feb 2020 11:09:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="xr0RKjXP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728024AbgBQLJL (ORCPT ); Mon, 17 Feb 2020 06:09:11 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:39107 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726826AbgBQLJL (ORCPT ); Mon, 17 Feb 2020 06:09:11 -0500 Received: by mail-wm1-f68.google.com with SMTP id c84so18001027wme.4 for ; Mon, 17 Feb 2020 03:09:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=T6lGwTZh7mHp1+xNe3270Amp1AhzDEDQq2tbWytRCkc=; b=xr0RKjXPVB+gRMbXfexYJNKjyWWOmWW1mV7pdgRe9rbLdRCTO7bxfxbB3RwTUZACDH LC23a15L1dYMi/FvFeXO4Ab3APGymTX7wpNiPQNR/rJ+XbS4NRNIrS5iGb+/s8dXyxq3 nJIp/RZHptbqhL91IkiPR1Q8Lb7a2bL+wwDax9bViLe375QUVxC5xYMPzfrTvJSN/jPQ V7GuOtfoyH/3rOnTx3uaNg4o+38tLK0xtCHEJWzC876dHD54ONAsKoIxrbzjUxGwktK8 qkmR2b2HB8vZD9IenM9u0qOu91wVN9zi7aZ6qd+uF4u94zyciEdlyPHUTgzzLYbjoVdo 8BZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=T6lGwTZh7mHp1+xNe3270Amp1AhzDEDQq2tbWytRCkc=; b=Y7AZiRIVnyB+6gGmS8VVqX8aRtNEAMrqlxG0CSHahfTqigEvUDSDDYzOP9R6fYvt4w Erl331uP41iLJ2++LvqVM1ghixVX8NDUp5i5TGf6LssNJ4fRYatvxl140eO3NzjFNfsn 026YViNiu7qopOBVp+gvE1WXAfIwHmpQ8UuKXf7Q8OUjWM3waQfcqpRpAq9E+HvATUDK +bRRupAVQBWZ7Y//98dBcqz6WNoWmRYsRADD4bQFZyLK7yRa+lykoWj+xFd30svNCUq5 sY9W5dxGW26bpp/G7vLZ/3JtggLPbRyedbWl+BytnNmEoTHVanijzI8LBK9E51pKNdnm nZCw== X-Gm-Message-State: APjAAAX2MeVtSA00RHcHz4hHzWQ4lAIgmY0/hUd+eV8dWefwl1ThntmK 6RGM2xeKRX0M2+y7tiP+t5n/B5iK1NY= X-Google-Smtp-Source: APXvYqwxkBnN7m+XKv747Z5vrFKzOGd501tfmlf/OlM+5CYpkdwBSTAEIw/f9X5gGNN2xTTgzKUdrA== X-Received: by 2002:a05:600c:214f:: with SMTP id v15mr22120513wml.110.1581937749544; Mon, 17 Feb 2020 03:09:09 -0800 (PST) Received: from apalos.home (ppp-2-87-54-32.home.otenet.gr. [2.87.54.32]) by smtp.gmail.com with ESMTPSA id u8sm178649wmm.15.2020.02.17.03.09.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 03:09:09 -0800 (PST) Date: Mon, 17 Feb 2020 13:09:06 +0200 From: Ilias Apalodimas To: Ard Biesheuvel Cc: Laszlo Ersek , linux-efi , Linux Kernel Mailing List , Leif Lindholm , Peter Jones , Matthew Garrett , Alexander Graf , Heinrich Schuchardt , Daniel Kiper , Arvind Sankar , James Bottomley , Lukas Wunner Subject: Re: [PATCH v2 2/3] efi/libstub: Add support for loading the initrd from a device path Message-ID: <20200217110906.GA147685@apalos.home> References: <20200216141104.21477-1-ardb@kernel.org> <20200216141104.21477-3-ardb@kernel.org> <4e427366-4141-e360-b1da-c5cb37f8092b@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org Hi Ard, [...] > > > > + return EFI_INVALID_PARAMETER; > > > > > > Doesn't return EFI_LOAD_ERROR. > > > > > > > + > > > > + dp = (efi_device_path_protocol_t *)&initrd_dev_path; > > > > + status = efi_bs_call(locate_device_path, &lf2_proto_guid, &dp, &handle); > > > > + if (status != EFI_SUCCESS) > > > > + return status; > > > > > > Seems safe (the only plausible error could be EFI_NOT_FOUND). > > > > > > > + > > > > + status = efi_bs_call(handle_protocol, handle, &lf2_proto_guid, > > > > + (void **)&lf2); > > > > + if (status != EFI_SUCCESS) > > > > + return status; > > > > > > Interesting case; this should never fail... but note, if it does, it > > > returns EFI_UNSUPPORTED, not EFI_NOT_FOUND (if the protocol is missing > > > from the handle). > > > > > > > + > > > > + status = efi_call_proto(lf2, load_file, dp, false, &initrd_size, NULL); > > > > + if (status != EFI_BUFFER_TOO_SMALL) > > > > + return EFI_LOAD_ERROR; > > > > + > > > > + status = efi_allocate_pages(initrd_size, &initrd_addr, max); > > > > + if (status != EFI_SUCCESS) > > > > + return status; > > > > > > Not sure about the efi_allocate_pages() wrapper (?); the UEFI service > > > could return EFI_OUT_OF_RESOURCES. > > > > > > > Hmm, guess I was a bit sloppy with the return codes. The important > > thing is that EFI_NOT_FOUND is only returned in the one specifically > > defined case. > > > > For the record [in case no respin+resend is needed for other reasons], > I intend to update the comment block as below, and keep the code as > is: > Yes i think this makes more sense the return codes are already correct and the fallback is properly triggered. For what it's worth Tested-by: Ilias Apalodimas Acked-by: Ilias Apalodimas > > * @load_addr: pointer to store the address where the initrd was loaded > * @load_size: pointer to store the size of the loaded initrd > * @max: upper limit for the initrd memory allocation > - * @return: %EFI_SUCCESS if the initrd was loaded successfully, in > which case > - * @load_addr and @load_size are assigned accordingly > - * %EFI_NOT_FOUND if no LoadFile2 protocol exists on the initrd > - * device path > + * @return: %EFI_SUCCESS if the initrd was loaded successfully, in which > + * case @load_addr and @load_size are assigned accordingly > + * %EFI_NOT_FOUND if no LoadFile2 protocol exists on the initrd > + * device path > + * %EFI_INVALID_PARAMETER if load_addr == NULL or load_size == NULL > + * %EFI_OUT_OF_RESOURCES if memory allocation failed > * %EFI_LOAD_ERROR in all other cases Regards /Ilias