2015-05-28 04:04:14

by Kinglong Mee

Subject: [PATCH] blkmapd: Fix infinite loop when reading serial

If (dev_id->ids & 0xf) < current_id, must updates pos when continue.
Otherwise an infinite loop.

No other places use the pos value, just move to the top of while.

Signed-off-by: Kinglong Mee <[email protected]>
---
utils/blkmapd/device-inq.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/utils/blkmapd/device-inq.c b/utils/blkmapd/device-inq.c
index c5bf71f..6b56b67 100644
--- a/utils/blkmapd/device-inq.c
+++ b/utils/blkmapd/device-inq.c
@@ -196,6 +196,8 @@ struct bl_serial *bldev_read_serial(int fd, const char *filename)

while (pos < (len - devid_len)) {
dev_id = (struct bl_dev_id *)&(dev_root->data[pos]);
+ pos += (dev_id->len + devid_len);
+
if ((dev_id->ids & 0xf) < current_id)
continue;
switch (dev_id->ids & 0xf) {
@@ -226,7 +228,6 @@ struct bl_serial *bldev_read_serial(int fd, const char *filename)
}
if (current_id == 3)
break;
- pos += (dev_id->len + devid_len);
}
out:
if (!serial_out)
--
2.4.1

2015-06-26 23:12:22

by Kinglong Mee

Subject: Re: [PATCH] blkmapd: Fix infinite loop when reading serial

ping...

On 5/28/2015 12:04 PM, Kinglong Mee wrote:
> If (dev_id->ids & 0xf) < current_id, must updates pos when continue.
> Otherwise an infinite loop.
>
> No other places use the pos value, just move to the top of while.
>
> Signed-off-by: Kinglong Mee <[email protected]>
> ---
> utils/blkmapd/device-inq.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/utils/blkmapd/device-inq.c b/utils/blkmapd/device-inq.c
> index c5bf71f..6b56b67 100644
> --- a/utils/blkmapd/device-inq.c
> +++ b/utils/blkmapd/device-inq.c
> @@ -196,6 +196,8 @@ struct bl_serial *bldev_read_serial(int fd, const char *filename)
>
> while (pos < (len - devid_len)) {
> dev_id = (struct bl_dev_id *)&(dev_root->data[pos]);
> + pos += (dev_id->len + devid_len);
> +
> if ((dev_id->ids & 0xf) < current_id)
> continue;
> switch (dev_id->ids & 0xf) {
> @@ -226,7 +228,6 @@ struct bl_serial *bldev_read_serial(int fd, const char *filename)
> }
> if (current_id == 3)
> break;
> - pos += (dev_id->len + devid_len);
> }
> out:
> if (!serial_out)
>

2015-06-30 18:18:22

by Steve Dickson

Subject: Re: [PATCH] blkmapd: Fix infinite loop when reading serial

On 05/28/2015 12:04 AM, Kinglong Mee wrote:
> If (dev_id->ids & 0xf) < current_id, must updates pos when continue.
> Otherwise an infinite loop.
>
> No other places use the pos value, just move to the top of while.
>
> Signed-off-by: Kinglong Mee <[email protected]>
Sorry for the delay.... Committed!

steved.
> ---
> utils/blkmapd/device-inq.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/utils/blkmapd/device-inq.c b/utils/blkmapd/device-inq.c
> index c5bf71f..6b56b67 100644
> --- a/utils/blkmapd/device-inq.c
> +++ b/utils/blkmapd/device-inq.c
> @@ -196,6 +196,8 @@ struct bl_serial *bldev_read_serial(int fd, const char *filename)
>
> while (pos < (len - devid_len)) {
> dev_id = (struct bl_dev_id *)&(dev_root->data[pos]);
> + pos += (dev_id->len + devid_len);
> +
> if ((dev_id->ids & 0xf) < current_id)
> continue;
> switch (dev_id->ids & 0xf) {
> @@ -226,7 +228,6 @@ struct bl_serial *bldev_read_serial(int fd, const char *filename)
> }
> if (current_id == 3)
> break;
> - pos += (dev_id->len + devid_len);
> }
> out:
> if (!serial_out)
>