@@ -21,13 +21,13 @@ use vm_memory::{Address, Bytes, GuestAddress, GuestMemory, GuestMemoryMmap, Gues
21
21
#[ allow( non_camel_case_types) ]
22
22
#[ allow( non_snake_case) ]
23
23
#[ allow( non_upper_case_globals) ]
24
- #[ cfg_attr( feature = "cargo-clippy" , allow( clippy) ) ]
24
+ #[ cfg_attr( feature = "cargo-clippy" , allow( clippy:: all ) ) ]
25
25
pub mod bootparam;
26
26
#[ allow( dead_code) ]
27
27
#[ allow( non_camel_case_types) ]
28
28
#[ allow( non_snake_case) ]
29
29
#[ allow( non_upper_case_globals) ]
30
- #[ cfg_attr( feature = "cargo-clippy" , allow( clippy) ) ]
30
+ #[ cfg_attr( feature = "cargo-clippy" , allow( clippy:: all ) ) ]
31
31
mod elf;
32
32
mod struct_util;
33
33
@@ -175,10 +175,10 @@ impl KernelLoader for Elf {
175
175
// If the program header is backwards, bail.
176
176
return Err ( Error :: InvalidProgramHeaderOffset ) ;
177
177
}
178
- if lowest_kernel_start. is_some ( ) {
179
- if ( ehdr. e_entry as u64 ) < lowest_kernel_start. unwrap ( ) . raw_value ( ) {
180
- return Err ( Error :: InvalidEntryAddress ) ;
181
- }
178
+ if ( lowest_kernel_start. is_some ( ) )
179
+ && ( ( ehdr. e_entry as u64 ) < lowest_kernel_start. unwrap ( ) . raw_value ( ) )
180
+ {
181
+ return Err ( Error :: InvalidEntryAddress ) ;
182
182
}
183
183
184
184
let mut loader_result: KernelLoaderResult = Default :: default ( ) ;
@@ -271,7 +271,7 @@ impl KernelLoader for BzImage {
271
271
272
272
// if the HdrS magic number is not found at offset 0x202, the boot protocol version is "old",
273
273
// the image type is assumed as zImage, not bzImage.
274
- if boot_header. header != 0x53726448 {
274
+ if boot_header. header != 0x5372_6448 {
275
275
return Err ( Error :: InvalidBzImage ) ;
276
276
}
277
277
@@ -289,15 +289,15 @@ impl KernelLoader for BzImage {
289
289
290
290
// verify bzImage validation by checking if code32_start, the defaults to the address of
291
291
// the kernel is not lower than high memory.
292
- if lowest_kernel_start. is_some ( ) {
293
- if ( boot_header. code32_start as u64 ) < lowest_kernel_start. unwrap ( ) . raw_value ( ) {
294
- return Err ( Error :: InvalidKernelStartAddress ) ;
295
- }
292
+ if ( lowest_kernel_start. is_some ( ) )
293
+ && ( u64 :: from ( boot_header. code32_start ) < lowest_kernel_start. unwrap ( ) . raw_value ( ) )
294
+ {
295
+ return Err ( Error :: InvalidKernelStartAddress ) ;
296
296
}
297
297
298
298
let mem_offset = match kernel_start {
299
299
Some ( start) => start,
300
- None => GuestAddress ( boot_header. code32_start as u64 ) ,
300
+ None => GuestAddress ( u64 :: from ( boot_header. code32_start ) ) ,
301
301
} ;
302
302
303
303
boot_header. code32_start = mem_offset. raw_value ( ) as u32 ;
0 commit comments