vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,931 Commits 7 Branches 0 Tags 72 MiB
Commit Graph

120 Commits

Author SHA1 Message Date
Peter Jones f725fa7cb2 calloc: Use calloc() at most places 
This modifies most of the places we do some form of:

  X = malloc(Y * Z);

to use calloc(Y, Z) instead.

Among other issues, this fixes:
  - allocation of integer overflow in grub_png_decode_image_header()
    reported by Chris Coulson,
  - allocation of integer overflow in luks_recover_key()
    reported by Chris Coulson,
  - allocation of integer overflow in grub_lvm_detect()
    reported by Chris Coulson.

Fixes: CVE-2020-14308

Signed-off-by: Peter Jones <pjones@redhat.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
 2020-07-29 16:55:47 +02:00
Vladimir Serbinenko 384091967d Rename grub_disk members 
Otherwise it horribly clashes with gnulib when it's
replacing open/write/read/close

Signed-off-by: Vladimir Serbinenko <phcoder@google.com>
 2019-03-25 15:14:52 +01:00
Andrei Borzenkov 269a522c7d hostdisk: fix device detection 
Condition was apparently reversed so GRUB assumed all devices were
files. This later made it skip BLKFLSBUF ioctl on Linux which caused
various page cache coherency issues. Observed were

- failure to validate blocklist install (read content did not match
  just written)

- failure to detect Linux MD on disk after online hot addition
  (GRUB got stale superblock)

Closes: 46691
 2016-01-10 10:41:04 +03:00
Andrei Borzenkov 2498dc7a3a hostdisk: fix crash with NULL device.map 
grub-macbless calls grub_util_biosdisk_init with NULL device.map.
 2015-05-17 14:16:36 +03:00
Vladimir Serbinenko 27d1a67f8a Fix canonicalize_file_name clash. 
canonicalize_file_name clashed with gnulib function. Additionally
it was declared in 2 places: emu/misc.h and util/misc.h. Added
grub_ prefix and removed second declaration.
 2015-03-04 01:00:19 +01:00
Vladimir Serbinenko 59d4036594 Replace explicit sizeof divisions by ARRAY_SIZE. 2015-01-21 17:37:31 +01:00
Vladimir Serbinenko 18e76955be Use %I64 and not %ll when using OS printf if compiling for windows. 2013-12-17 16:04:47 +01:00
Vladimir Serbinenko cd46aa6cef Rewrite grub-install, grub-mkrescue, grub-mkstandalone and grub-mknetdir 
the function of these files exceeds what can be sanely handled in shell
	in posix-comaptible way. Also writing it in C extends the functionality
	to non-UNIX-like OS and minimal environments.
 2013-11-16 20:21:16 +01:00
Vladimir Serbinenko cb72aa1809 Rewrite blocklist functions in order to get progress when 
reading large extents and decrease amount of blocklist hook calls.
 2013-11-01 23:28:03 +01:00
Vladimir Serbinenko 64db14b0cb * grub-core/kern/emu/hostdisk.c (grub_util_check_file_presence): Use 
windows method on other platforms without good stat as well.
 2013-10-28 02:17:56 +01:00
Vladimir 'phcoder' Serbinenko 887c0bb61a * grub-core/kern/emu/hostdisk.c: Remove few leftover includes. 2013-10-19 16:32:28 +02:00
Vladimir 'phcoder' Serbinenko b73249d260 Make grub_util_fd_seek match behaviour of other grub_util_fd_* and 
fseeko.
 2013-10-14 12:47:09 +02:00
Vladimir 'phcoder' Serbinenko 6de292cb9b Define GRUB_UTIL_FD_O_* and always use them with grub_util_fd_open. 2013-10-14 02:11:59 +02:00
Vladimir 'phcoder' Serbinenko bb338aaf24 Add a wrapper for fopen. On unix-like systems just pass-through. On 
windows use unicode version.
 2013-10-13 20:36:28 +02:00
Vladimir 'phcoder' Serbinenko caca1c70cf Move OS-specific driver configuration to grub_util_fd_open. This 
moves OS-dependent parts from kern/emu/hostdisk.c to
	grub-core/osdep/*/hostdisk.c.
 2013-10-09 07:04:25 +02:00
Vladimir 'phcoder' Serbinenko bab7b1ebeb * include/grub/emu/hostdisk.h (GRUB_FD_STAT_IS_FUNTIONAL): New define. 
Migrate all explicit defines to this new one.
 2013-09-24 19:17:24 +02:00
Vladimir 'phcoder' Serbinenko 43b1c99d53 * grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_open): Use 
grub_util_fd_strerror when using grub_util_fd_*.
	(grub_util_fd_open_device): Likewise.
	(grub_util_biosdisk_read): Likewise.
	(grub_util_biosdisk_write): Likewise.
	* grub-core/kern/emu/hostdisk_unix.c (grub_util_fd_open): New function.
	(grub_util_fd_strerror): Likewise.
	(grub_util_fd_sync): Likewise.
	(grub_util_fd_close): Likewise.
	* grub-core/kern/emu/hostdisk_windows.c (grub_util_fd_sync): Likewise.
	(grub_util_fd_close): Likewise.
	(grub_util_fd_strerror): Likewise.
	* include/grub/emu/hostdisk.h (grub_util_fd_close): Make into real
	function proto rather than macro.
	(grub_util_fd_sync): Likewise.
	(grub_util_fd_open): Likewise.
	(grub_util_fd_strerror): New proto.
 2013-09-24 19:08:34 +02:00
Vladimir 'phcoder' Serbinenko bf645fda03 * grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_open): Move struct 
stat immediately to where it's used.
 2013-09-24 18:57:19 +02:00
Vladimir 'phcoder' Serbinenko 9db826e149 * grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_close): Fix 
disk closing logic.
 2013-09-24 18:36:51 +02:00
Vladimir 'phcoder' Serbinenko 7e518ca84f Use Winapi on both cygwin and mingw32 to share more code between both. 2013-09-23 11:21:09 +02:00
Vladimir 'phcoder' Serbinenko 3ff4063dd3 * grub-core/kern/emu/hostdisk.c: Disentagle into a series of OS-specific 
files rather than one file with loads of #if's.
	* util/getroot.c: Likewise.
 2013-09-22 07:36:17 +02:00
Vladimir 'phcoder' Serbinenko 386701a8fe Handle the case of partitioned LVM properly. 
* grub-core/kern/emu/hostdisk.c (grub_util_get_dm_node_linear_info):
	Stop on meeting LVM, mpath or DMRAID.
	(grub_hostdisk_os_dev_to_grub_drive): Canonicalize os device.
	(read_device_map): Likewise.
	* util/getroot.c (convert_system_partition_to_system_disk): Assume that
	device is full disk rather than erroring out on LVM and similar cases.
 2013-09-19 08:48:54 +02:00
Vladimir 'phcoder' Serbinenko 984cfd8a79 * grub-core/kern/emu/hostdisk.c (grub_util_get_fd_size): Adapt for 
mingw32 as well based on grub_util_get_disk_size.
	* util/misc.c (grub_util_get_disk_size): Removed. all users switched to
	grub_util_get_fd_size.
	(sync): Removed.
	(fsync): Moved to ...
	* grub-core/kern/emu/misc.c (fsync): ... here.
 2013-08-22 16:50:12 +02:00
Ilya Bakulin 0031b22993 * grub-core/kern/emu/hostdisk.c: Add conditionals for OpenBSD. 
* util/getroot.c: Likewise.
 2013-08-21 21:05:01 +02:00
Vladimir 'phcoder' Serbinenko f0b94ded6d * grub-core/kern/emu/misc.c (grub_device_mapper_supported): Move from 
here ...
	* grub-core/kern/emu/hostdisk.c (grub_device_mapper_supported): ... to
	here.
 2013-08-14 17:55:15 +02:00
Vladimir 'phcoder' Serbinenko 053cfcddf1 Import new gnulib. 2013-04-11 21:12:46 +02:00
Vladimir 'phcoder' Serbinenko 49818a594a Fix missing PVs if they don't contain "interesting" LV. Closes #38677. 
Fix few warining messages and leaks while on it.
 2013-04-11 00:08:27 +02:00
Vladimir 'phcoder' Serbinenko ca9c260868 * grub-core/kern/emu/hostdisk.c (read_device_map): Remove nested 
function.
 2013-03-01 13:46:24 +01:00
Colin Watson 25239370fd Remove nested functions from device iterators. 
* include/grub/arc/arc.h (grub_arc_iterate_devs_hook_t): New type.
(grub_arc_iterate_devs): Add hook_data argument.
* include/grub/ata.h (grub_ata_dev_iterate_hook_t): New type.
(struct grub_ata_dev.iterate): Add hook_data argument.
* include/grub/device.h (grub_device_iterate_hook_t): New type.
(grub_device_iterate): Add hook_data argument.
* include/grub/disk.h (grub_disk_dev_iterate_hook_t): New type.
(struct grub_disk_dev.iterate): Add hook_data argument.
(grub_disk_dev_iterate): Likewise.
* include/grub/gpt_partition.h (grub_gpt_partition_map_iterate):
Likewise.
* include/grub/msdos_partition.h (grub_partition_msdos_iterate):
Likewise.
* include/grub/partition.h (grub_partition_iterate_hook_t): New
type.
(struct grub_partition_map.iterate): Add hook_data argument.
(grub_partition_iterate): Likewise.
* include/grub/scsi.h (grub_scsi_dev_iterate_hook_t): New type.
(struct grub_scsi_dev.iterate): Add hook_data argument.

Update all callers.
 2013-01-20 15:52:15 +00:00
Vladimir 'phcoder' Serbinenko 22099030ad * grub-core/kern/emu/hostdisk.c (read_device_map): Explicitly 
delimit path in strings using quotes.
	* util/getroot.c (grub_guess_root_devices): Likewise.
	(grub_make_system_path_relative_to_its_root): Likewise.
	* util/grub-probe.c (probe): Likewise.
	* util/ieee1275/ofpath.c (find_obppath): Likewise.
	(xrealpath): Likewise.
 2013-01-13 22:45:16 +01:00
Grégoire Sutre 650cfcfea2 Fix overflow in grub_util_get_fd_size for NetBSD. 2012-06-25 10:09:57 +02:00
Vladimir 'phcoder' Serbinenko 558d3a6023 * util/getroot.c (grub_util_get_dm_node_linear_info): Moved from here... 
* grub-core/kern/emu/hostdisk.c (grub_util_get_dm_node_linear_info):
	to here. New return value start. All users updated.
	Recursively scan linear mappings.
	* include/grub/emu/hostdisk.h (grub_util_get_dm_node_linear_info): New
	proto.
	* grub-core/kern/emu/hostdisk.c (grub_hostdisk_find_partition_start):
	Use grub_util_get_dm_node_linear_info.
	* util/getroot.c (convert_system_partition_to_system_disk): Use
	grub_util_info rather than grub_dprintf.
	(grub_util_biosdisk_get_grub_dev): Add a new grub_util_info.
 2012-06-07 14:24:48 +02:00
Vladimir 'phcoder' Serbinenko 6297e19736 * grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_write) [__linux__]: 
Fix MBR remapping workaround.
	(grub_util_biosdisk_read) [__linux__]: Likewise.
 2012-06-02 13:48:44 +02:00
Vladimir 'phcoder' Serbinenko 1d80c62a8f * grub-core/kern/emu/hostdisk.c (open_device): Set dest->dev to 0 after 
freeing.
 2012-05-27 13:19:09 +02:00
Vladimir 'phcoder' Serbinenko 5eae317511 * grub-core/kern/emu/hostdisk.c (read_device_map): Improve TRANSLATORS 
comment.
 2012-05-12 14:15:45 +02:00
Vladimir 'phcoder' Serbinenko f1a6254cf1 Flush block cache on adding disk to device map. 
* grub-core/kern/emu/hostdisk.c (flush_initial_buffer): New function.
	(grub_hostdisk_os_dev_to_grub_drive): Call flush_initial_buffer on
	adding.
	(read_device_map): Likewise.
	(open_device): Flush on opening.
 2012-05-11 21:03:47 +02:00
Vladimir 'phcoder' Serbinenko 5f6ac15e84 * grub-core/kern/emu/hostdisk.c (read_device_map): Skip invalid Fedora 
entries.
 2012-05-04 00:07:55 +02:00
Vladimir 'phcoder' Serbinenko 11858300e9 * grub-core/commands/menuentry.c: Add TRANSLATORS comments. 
* grub-core/kern/emu/hostdisk.c: Likewise.
 2012-05-03 23:43:59 +02:00
Vladimir 'phcoder' Serbinenko e3282399ad * grub-core/kern/emu/hostdisk.c (read_device_map): Reject non-standard 
disk names.
	* docs/grub.texi: Update device.map parts.
 2012-05-01 15:02:34 +02:00
Vladimir 'phcoder' Serbinenko 385f9abbe3 * grub-core/kern/emu/hostdisk.c (map): Make static. 2012-04-23 17:14:48 +02:00
Samuel Thibault 524b5d3a7c Fix hurd build. 
* grub-core/kern/emu/hostdisk.c (grub_util_get_fd_size) [__GNU__]: Do
not define nr variable.
 2012-04-22 18:44:19 +02:00
Vladimir 'phcoder' Serbinenko 9a06490c07 Fix kfreebsd compile and behaviour. 
* grub-core/kern/emu/hostdisk.c (grub_util_follow_gpart_up): Fix
	format-security.
	* util/getroot.c: Fix wait.h include.
	(grub_guess_root_devices): Error if grub_find_device fails.
	(grub_util_get_geom_abstraction): Fix shadowing and format-security.
	(grub_util_get_dev_abstraction): Likewise.
	(grub_util_pull_device): Likewise.
	(grub_util_get_grub_dev): Likewise.
	* util/lvm.c (grub_util_lvm_isvolume): Likewise.
 2012-04-21 16:49:56 +02:00
Vladimir 'phcoder' Serbinenko ebbd24f3eb * grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_write): Fix opening 
mode.
 2012-04-19 20:35:06 +02:00
Vladimir 'phcoder' Serbinenko 59e2651a06 * grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_write): Fix message 
disunification.
 2012-04-18 23:48:52 +02:00
Vladimir 'phcoder' Serbinenko cb7f944e44 * grub-core/kern/emu/hostdisk.c (open_device): New argument max. All 
users updated.
	(grub_util_biosdisk_read): Handle Linux partitions not exactly
	corresponding to GRUB partitions.
	(grub_util_biosdisk_write): Likewise.
 2012-04-18 23:18:51 +02:00
Vladimir 'phcoder' Serbinenko 40211ab884 * grub-core/commands/acpihalt.c: Add TRANSLATORS comments. 
* grub-core/commands/keystatus.c: Likewise.
	* grub-core/commands/loadenv.c: Likewise.
	* grub-core/commands/probe.c: Likewise.
	* grub-core/commands/regexp.c: Likewise.
	* grub-core/commands/true.c: Likewise.
	* grub-core/commands/videoinfo.c: Likewise.
	* grub-core/disk/cryptodisk.c: Likewise.
	* grub-core/disk/ldm.c: Likewise.
	* grub-core/disk/loopback.c: Likewise.
	* grub-core/disk/luks.c: Likewise.
	* grub-core/fs/zfs/zfsinfo.c: Likewise.
	* grub-core/kern/disk.c: Likewise.
	* grub-core/kern/emu/hostdisk.c: Likewise.
 2012-03-03 12:59:28 +01:00
Vladimir 'phcoder' Serbinenko 88d51eff35 * util/resolve.c (read_dep_list): Use grub_isspace instead of isspace. 
* grub-core/kern/emu/hostdisk.c (read_device_map): Likewise.
 2012-03-02 11:18:11 +01:00
Vladimir 'phcoder' Serbinenko a121c9648e Use the common size routine in hostfs so we can read disks as well. 
* grub-core/kern/emu/hostdisk.c (grub_util_get_fd_sectors): Rename to ..
	(grub_util_get_fd_size): ... this. Return size in bytes.
	All users updated.
	* grub-core/kern/emu/hostfs.c (grub_hostfs_open): Use
	grub_util_get_fd_size.
 2012-02-29 15:23:31 +01:00
Vladimir 'phcoder' Serbinenko c66d641020 * grub-core/kern/emu/hostdisk.c (grub_util_get_fd_sectors) [__APPLE__]: 
Add blocksize retrieval.
 2012-02-29 15:17:59 +01:00
Vladimir 'phcoder' Serbinenko 67093bc0ed Another round of string clarification and adding TRANSLATORS comments. 2012-02-26 17:28:05 +01:00