https://github.com/torvalds/linux
Revision ccece235d3737221e7a1118fdbd8474112adac84 authored by Alex Elder on 11 July 2012, 01:30:10 UTC, committed by Sage Weil on 31 July 2012, 01:21:46 UTC
This fixes a few issues in rbd_header_from_disk(): - There is a check intended to catch overflow, but it's wrong in two ways. - First, the type we don't want to overflow is size_t, not unsigned int, and there is now a SIZE_MAX we can use for use with that type. - Second, we're allocating the snapshot ids and snapshot image sizes separately (each has type u64; on disk they grouped together as a rbd_image_header_ondisk structure). So we can use the size of u64 in this overflow check. - If there are no snapshots, then there should be no snapshot names. Enforce this, and issue a warning if we encounter a header with no snapshots but a non-zero snap_names_len. - When saving the snapshot names into the header, be more direct in defining the offset in the on-disk structure from which they're being copied by using "snap_count" rather than "i" in the array index. - If an error occurs, the "snapc" and "snap_names" fields are freed at the end of the function. Make those fields be null pointers after they're freed, to be explicit that they are no longer valid. - Finally, move the definition of the local variable "i" to the innermost scope in which it's needed. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
1 parent 913d2fd
Tip revision: ccece235d3737221e7a1118fdbd8474112adac84 authored by Alex Elder on 11 July 2012, 01:30:10 UTC
rbd: fixes in rbd_header_from_disk()
rbd: fixes in rbd_header_from_disk()
Tip revision: ccece23
File | Mode | Size |
---|---|---|
Documentation | ||
arch | ||
block | ||
crypto | ||
drivers | ||
firmware | ||
fs | ||
include | ||
init | ||
ipc | ||
kernel | ||
lib | ||
mm | ||
net | ||
samples | ||
scripts | ||
security | ||
sound | ||
tools | ||
usr | ||
virt | ||
.gitignore | -rw-r--r-- | 1014 bytes |
.mailmap | -rw-r--r-- | 4.3 KB |
COPYING | -rw-r--r-- | 18.3 KB |
CREDITS | -rw-r--r-- | 92.7 KB |
Kbuild | -rw-r--r-- | 2.5 KB |
Kconfig | -rw-r--r-- | 252 bytes |
MAINTAINERS | -rw-r--r-- | 207.4 KB |
Makefile | -rw-r--r-- | 46.0 KB |
README | -rw-r--r-- | 17.3 KB |
REPORTING-BUGS | -rw-r--r-- | 3.3 KB |
Computing file changes ...