diff options
| author | Yunlian Jiang <yunlian@google.com> | 2015-04-15 10:26:20 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-04-15 22:58:06 +0000 |
| commit | 710485a5710215da2e0d4cd4d45c5843e360f0e7 (patch) | |
| tree | 1881c49757f2e3c8e35c7d6032cf543324a1233c /firmware/lib20 | |
| parent | eff3100f0efcba12c4403b9c86c5227dd41916ac (diff) | |
| download | vboot-710485a5710215da2e0d4cd4d45c5843e360f0e7.tar.gz | |
vboot_reference: fix several syntax warnings found by clang.stabilize-6996.B
BUG=chromium:475949
TEST=CC=x86_64-cros-linux-gnu-clang CXX=x86_64-cros-linux-gnu-clang++
emerge-falco vboot_reference
BRANCH=none
Change-Id: I3341e840c3f26f8579d35e0bb411566b0ad86164
Reviewed-on: https://chromium-review.googlesource.com/265834
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Queue: Yunlian Jiang <yunlian@chromium.org>
Tested-by: Yunlian Jiang <yunlian@chromium.org>
Diffstat (limited to 'firmware/lib20')
| -rw-r--r-- | firmware/lib20/common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/lib20/common.c b/firmware/lib20/common.c index 9ce9d840..cee6cb42 100644 --- a/firmware/lib20/common.c +++ b/firmware/lib20/common.c @@ -28,14 +28,14 @@ int vb2_verify_member_inside(const void *parent, size_t parent_size, const ptrdiff_t data_end_offs = data_offs + member_data_size; /* Make sure parent doesn't wrap */ - if (parent_size < 0 || parent_end < (uintptr_t)parent) + if (parent_end < (uintptr_t)parent) return VB2_ERROR_INSIDE_PARENT_WRAPS; /* * Make sure the member is fully contained in the parent and doesn't * wrap. Use >, not >=, since member_size = 0 is possible. */ - if (member_size < 0 || member_end_offs < member_offs) + if (member_end_offs < member_offs) return VB2_ERROR_INSIDE_MEMBER_WRAPS; if (member_offs < 0 || member_offs > parent_size || member_end_offs > parent_size) @@ -46,7 +46,7 @@ int vb2_verify_member_inside(const void *parent, size_t parent_size, return VB2_ERROR_INSIDE_DATA_OVERLAP; /* Make sure parent fully contains member data, if any */ - if (member_data_size < 0 || data_end_offs < data_offs) + if (data_end_offs < data_offs) return VB2_ERROR_INSIDE_DATA_WRAPS; if (data_offs < 0 || data_offs > parent_size || data_end_offs > parent_size) |