[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Xen-devel] [GRUB PATCH 1/2] verifiers: Xen fallout cleanup
- To: Daniel Kiper <daniel.kiper@xxxxxxxxxx>, grub-devel@xxxxxxx, xen-devel@xxxxxxxxxxxxxxxxxxxx
- From: Ross Philipson <ross.philipson@xxxxxxxxxx>
- Date: Thu, 6 Dec 2018 10:37:43 -0500
- Autocrypt: addr=ross.philipson@xxxxxxxxxx; keydata= xsBNBFtHZ04BCADHhtvMImplKfIEOytU7ZH4haZ9eFAqZpGeIpG9D+pzTCuReM2/49bvgNoI e1xuiQFO+UEJ8FjedFjDdqY7fSw3xVdX9gLwD1Rmw0Dadc1w6sGbcoOQLHcglesu+BmcKBtU tWQZkzCpEShN4etgZThk8469YnAvO08vNZsrizgrpD90T7mEYiNXxIkX87sPGbnBrL1X7RvZ TaRXfE8174W+XVwGEpSiO/GjRgLW8+DFZB5MgXpCR993+U1YT9Lz97/MRzr4hqcOYry6LBYi s8dOly4oP7gK15oW8Xap9+ur0Jd8Vy8o99Axq+7yunF+2KE2SwP3/w8H3VDpx7EeDhWDABEB AAHNKlJvc3MgUGhpbGlwc29uIDxyb3NzLnBoaWxpcHNvbkBvcmFjbGUuY29tPsLAlAQTAQgA PgIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBFsN7r6v0OZTCaJ1wdpHdTZHiMYcBQJb R2eBBQkJZgGzAAoJENpHdTZHiMYcPYcH/Rlp3/F3P4/2i/W0F4yQDVD6rAkejCws4KlbgC5D Slkdvk6j8jOW/HNeIY3n+a3mW0iyyhZlipgYAqkK1loDiDxJjc2eUaHxiYWNLQ4CwIj2EC27 AWCp6hgwHNWmZrdeNbM/Z6LTFQILx5xzgX+86KNqzFV7gOcAaS2qBVz1D83dgrFZaGaao918 nvfe+SnImo0GaEf8nVDKgsD2zfzMBkk4q/E0mrEADFXwBHSvNCnVyrCN6Ve0dHWgI7SszUDt 7v01zbGPR5mRfGuyC9gykd2SDCw5/Q27RMWfaPFL/dtiZBljUzb2yW5jicZAz7zNdDcBSUGR r//wxtG4k/dBrMXOwE0EW0dnTwEIAPelEnLDnfJnHdFR+1Thrvv3Udt/1cjqQfHqH4F8zef/ MsIcPV1skL7qPUYD+CrbasvmqhlPxtJAtN68inPa70fA2g0PtNmLUH1NBb2e6EjOoVZg9ais BWfdYUITZouOXs2zCTFsoNWjTJANnXxexbTf1ZEqfzlVtQK+xAnXl3kiL4Y47VMbgDkGedhw 3ZMWQ2zMMZqYJkPYhtlTXtedhV91DL1347ULwHsvkUJDZ0gL+WU6tYhsCOOiD61x58PfUiFb /WkZEPxb96dSSSWrTlLlBWSSD24RnhfbJjfsXeSu9s4XldmGTDkj7jclMVU1xV0BUfqEwhVn xR8FlC+dZvkAEQEAAcLAfAQYAQgAJgIbDBYhBFsN7r6v0OZTCaJ1wdpHdTZHiMYcBQJbR2eB BQkJZgGyAAoJENpHdTZHiMYcDIAIAIRJrKjIStRvLsOOCX92s9XJPUjrC/xmtVsqVviyFWIC QRPQzDE+bDSvRazudBHmcPW+BOOB5B+p7zKZzOGoZV2peG8oA/Y8oCxOYBtpbBaZ5KJexm/g BbnJUwb3uhmKtDShHGUCmtq8MZBJBr6Q6xHprOU8Qnzs9Jea8NVwaz9O226Rrg4XVv/sK1Lh ++xZfhi7YqKWdx5vdfdnX1xWe8ma0eXLeCDh3V6Ys+Habw1jEbMuafrcVzAbp1rMt2Lju1ls BNAoxeViK7QXWfwGTmGJP++jHmo99gMqEtiohf+37N0oS6uYu6kaE7PxsEcOjWKJxW/DdgwO eFq+D6xuiKk=
- Cc: phcoder@xxxxxxxxx, xudong.hao@xxxxxxxxx, leif.lindholm@xxxxxxxxxx, julien.grall@xxxxxxx, farrah.chen@xxxxxxxxx, lee.jones@xxxxxxxxxx, fu.wei@xxxxxxxxxx
- Delivery-date: Thu, 06 Dec 2018 15:38:31 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
- Openpgp: preference=signencrypt
On 12/06/2018 08:40 AM, Daniel Kiper wrote:
> Xen fallout cleanup after commit ca0a4f689 (verifiers: File type for
> fine-grained signature-verification controlling).
>
> Signed-off-by: Daniel Kiper <daniel.kiper@xxxxxxxxxx>
> ---
> grub-core/loader/i386/xen.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
> index 1a99ca72c..8f662c8ac 100644
> --- a/grub-core/loader/i386/xen.c
> +++ b/grub-core/loader/i386/xen.c
> @@ -645,10 +645,10 @@ grub_cmd_xen (grub_command_t cmd __attribute__
> ((unused)),
>
> grub_xen_reset ();
>
> - grub_create_loader_cmdline (argc - 1, argv + 1,
> - (char *) xen_state.next_start.cmd_line,
> - sizeof (xen_state.next_start.cmd_line) - 1);
> - err = grub_verify_string (xen_state.next_start.cmd_line,
> GRUB_VERIFY_MODULE_CMDLINE);
> + err = grub_create_loader_cmdline (argc - 1, argv + 1,
> + (char *) xen_state.next_start.cmd_line,
> + sizeof (xen_state.next_start.cmd_line) - 1,
> + GRUB_VERIFY_KERNEL_CMDLINE);
How did this compile previously if you were missing an argument to
grub_create_loader_cmdline?
> if (err)
> return err;
>
> @@ -910,9 +910,9 @@ grub_cmd_module (grub_command_t cmd __attribute__
> ((unused)),
> if (err)
> goto fail;
>
> - grub_create_loader_cmdline (argc - 1, argv + 1,
> - get_virtual_current_address (ch), cmdline_len);
> - err = grub_verify_string (get_virtual_current_address (ch),
> GRUB_VERIFY_MODULE_CMDLINE);
> + err = grub_create_loader_cmdline (argc - 1, argv + 1,
> + get_virtual_current_address (ch),
> cmdline_len,
> + GRUB_VERIFY_MODULE_CMDLINE);
> if (err)
> goto fail;
>
>
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel
|
