On Thu, 2017-07-20 at 17:27 +0200, Martin Wilck wrote: > Some broken targets (such as the current Linux target) pad > model or serial fields with 0-bytes rather than spaces. The > NVME spec disallows 0 bytes in "ASCII" fields. > Thus strip trailing 0-bytes, too. > > Signed-off-by: Martin Wilck <mwi...@suse.com> > Reviewed-by: Hannes Reinecke <h...@suse.de> > Acked-by: Christoph Hellwig <h...@lst.de> > > --- > drivers/nvme/host/core.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c [] > @@ -2001,9 +2001,11 @@ static ssize_t wwid_show(struct device *dev, struct > device_attribute *attr, > if (memchr_inv(ns->eui, 0, sizeof(ns->eui))) > return sprintf(buf, "eui.%8phN\n", ns->eui); > > - while (ctrl->serial[serial_len - 1] == ' ') > + while (ctrl->serial[serial_len - 1] == ' ' || > + ctrl->serial[serial_len - 1] == '\0') > serial_len--; > - while (ctrl->model[model_len - 1] == ' ') > + while (ctrl->model[model_len - 1] == ' ' || > + ctrl->model[model_len - 1] == '\0') > model_len--;
Please add a <foo>_len > 0 to the while loops too
