]> git.baikalelectronics.ru Git - kernel.git/commit
vhost: fix vhost_vq_access_ok() log check
authorStefan Hajnoczi <stefanha@redhat.com>
Wed, 11 Apr 2018 02:35:40 +0000 (10:35 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Apr 2018 14:54:06 +0000 (10:54 -0400)
commitf6eab43d25edb176a4d76b2fec78696891919d7f
tree94e3974bf7a5a5ea27d3cbc4c117792213ac6a3e
parent7182a85c0792f0a434e209924eac28ff22644617
vhost: fix vhost_vq_access_ok() log check

Commit 25fff3bf88d2fe5d22ce2d904e818cf52a44b183 ("vhost: validate log
when IOTLB is enabled") introduced a regression.  The logic was
originally:

  if (vq->iotlb)
      return 1;
  return A && B;

After the patch the short-circuit logic for A was inverted:

  if (A || vq->iotlb)
      return A;
  return B;

This patch fixes the regression by rewriting the checks in the obvious
way, no longer returning A when vq->iotlb is non-NULL (which is hard to
understand).

Reported-by: syzbot+65a84dde0214b0387ccd@syzkaller.appspotmail.com
Cc: Jason Wang <jasowang@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/vhost/vhost.c