diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-05-06 07:28:32 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2014-07-10 12:35:23 -0400 |
commit | bf0d6e4a1138e71cafdbbb99cde430eee50c4ff1 (patch) | |
tree | 42be197cc003ef248360e85581d974463d4a45cb | |
parent | 1e39152fea2dccd1af6479aa1a036201886f0743 (diff) |
drbd: silence underflow warning in read_in_block()
My static checker warns that "data_size" could be negative and underflow
the limit check. The code looks suspicious but I don't know if it is a
real bug.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
-rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 2 | ||||
-rw-r--r-- | include/linux/drbd.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index f972988291c5..9342b8da73ab 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
@@ -1592,7 +1592,7 @@ read_in_block(struct drbd_peer_device *peer_device, u64 id, sector_t sector, | |||
1592 | struct drbd_peer_request *peer_req; | 1592 | struct drbd_peer_request *peer_req; |
1593 | struct page *page; | 1593 | struct page *page; |
1594 | int dgs, ds, err; | 1594 | int dgs, ds, err; |
1595 | int data_size = pi->size; | 1595 | unsigned int data_size = pi->size; |
1596 | void *dig_in = peer_device->connection->int_dig_in; | 1596 | void *dig_in = peer_device->connection->int_dig_in; |
1597 | void *dig_vv = peer_device->connection->int_dig_vv; | 1597 | void *dig_vv = peer_device->connection->int_dig_vv; |
1598 | unsigned long *data; | 1598 | unsigned long *data; |
diff --git a/include/linux/drbd.h b/include/linux/drbd.h index 20ec8903b1e4..debb70d40547 100644 --- a/include/linux/drbd.h +++ b/include/linux/drbd.h | |||
@@ -52,7 +52,7 @@ | |||
52 | #endif | 52 | #endif |
53 | 53 | ||
54 | extern const char *drbd_buildtag(void); | 54 | extern const char *drbd_buildtag(void); |
55 | #define REL_VERSION "8.4.3" | 55 | #define REL_VERSION "8.4.5" |
56 | #define API_VERSION 1 | 56 | #define API_VERSION 1 |
57 | #define PRO_VERSION_MIN 86 | 57 | #define PRO_VERSION_MIN 86 |
58 | #define PRO_VERSION_MAX 101 | 58 | #define PRO_VERSION_MAX 101 |