From: Daniel Wagner <dwagner@suse.de>
Date: Wed, 12 Apr 2023 13:43:18 +0000 (+0200)
Subject: tree: Fix offset argument check in nvme_bytes_to_lba
X-Git-Tag: v1.5~55
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b26dfb6e49d9e6f6a42e6de9c49f1da733a34324;p=users%2Fsagi%2Flibnvme.git

tree: Fix offset argument check in nvme_bytes_to_lba

Also offset modulo blocksize needs to be 0. Commit 01c6055e5602 ("tree:
Fix argument check in nvme_bytes_to_lba") missed to update this, thus do
it now.

Signed-off-by: Daniel Wagner <dwagner@suse.de>
---

diff --git a/src/nvme/tree.c b/src/nvme/tree.c
index c649408a..c7ade353 100644
--- a/src/nvme/tree.c
+++ b/src/nvme/tree.c
@@ -1482,7 +1482,7 @@ static int nvme_bytes_to_lba(nvme_ns_t n, off_t offset, size_t count,
 	int bs;
 
 	bs = nvme_ns_get_lba_size(n);
-	if (!count || offset & bs || count & (bs - 1)) {
+	if (!count || offset & (bs - 1) || count & (bs - 1)) {
 		errno = EINVAL;
 		return -1;
 	}