All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: mst@redhat.com, jasowang@redhat.com
Cc: virtualization@lists.linux-foundation.org,
	linux-kernel@vger.kernel.org, f.hetzelt@tu-berlin.de,
	david.kaplan@amd.com, konrad.wilk@oracle.com,
	Amit Shah <amit@kernel.org>
Subject: [PATCH V2 04/12] virtio_console: validate max_nr_ports before trying to use it
Date: Tue, 12 Oct 2021 14:52:19 +0800	[thread overview]
Message-ID: <20211012065227.9953-5-jasowang@redhat.com> (raw)
In-Reply-To: <20211012065227.9953-1-jasowang@redhat.com>

We calculate nr_ports based on the max_nr_ports:

nr_queues = use_multiport(portdev) ? (nr_ports + 1) * 2 : 2;

If the device advertises a large max_nr_ports, we will end up with a
integer overflow. Fixing this by validating the max_nr_ports
advertised by the device in .validate() and clear the MULTIPORT is
it's greater than 0x8000 (which is guaranteed be safe).

Cc: Amit Shah <amit@kernel.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 drivers/char/virtio_console.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index daeed31df622..ef13763699c0 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -28,6 +28,7 @@
 #include "../tty/hvc/hvc_console.h"
 
 #define is_rproc_enabled IS_ENABLED(CONFIG_REMOTEPROC)
+#define VIRTCONS_MAX_PORTS 0x8000
 
 /*
  * This is a global struct for storing common data for all the devices
@@ -1981,6 +1982,8 @@ static void virtcons_remove(struct virtio_device *vdev)
 
 static int virtcons_validate(struct virtio_device *vdev)
 {
+	u32 max_nr_ports;
+
 	if (is_rproc_serial(vdev)) {
 		/* Don't test F_SIZE at all if we're rproc: not a
 		 * valid feature! */
@@ -1999,6 +2002,13 @@ static int virtcons_validate(struct virtio_device *vdev)
 		return -EINVAL;
 	}
 
+	if (virtio_cread_feature(vdev, VIRTIO_CONSOLE_F_MULTIPORT,
+				 struct virtio_console_config, max_nr_ports,
+				 &max_nr_ports) == 0) {
+		if (max_nr_ports == 0 || max_nr_ports > VIRTCONS_MAX_PORTS)
+			__virtio_clear_bit(vdev, VIRTIO_CONSOLE_F_MULTIPORT);
+	}
+
 	return 0;
 }
 
-- 
2.25.1


WARNING: multiple messages have this Message-ID (diff)
From: Jason Wang <jasowang@redhat.com>
To: mst@redhat.com, jasowang@redhat.com
Cc: f.hetzelt@tu-berlin.de, david.kaplan@amd.com,
	Amit Shah <amit@kernel.org>,
	konrad.wilk@oracle.com, linux-kernel@vger.kernel.org,
	virtualization@lists.linux-foundation.org
Subject: [PATCH V2 04/12] virtio_console: validate max_nr_ports before trying to use it
Date: Tue, 12 Oct 2021 14:52:19 +0800	[thread overview]
Message-ID: <20211012065227.9953-5-jasowang@redhat.com> (raw)
In-Reply-To: <20211012065227.9953-1-jasowang@redhat.com>

We calculate nr_ports based on the max_nr_ports:

nr_queues = use_multiport(portdev) ? (nr_ports + 1) * 2 : 2;

If the device advertises a large max_nr_ports, we will end up with a
integer overflow. Fixing this by validating the max_nr_ports
advertised by the device in .validate() and clear the MULTIPORT is
it's greater than 0x8000 (which is guaranteed be safe).

Cc: Amit Shah <amit@kernel.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 drivers/char/virtio_console.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index daeed31df622..ef13763699c0 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -28,6 +28,7 @@
 #include "../tty/hvc/hvc_console.h"
 
 #define is_rproc_enabled IS_ENABLED(CONFIG_REMOTEPROC)
+#define VIRTCONS_MAX_PORTS 0x8000
 
 /*
  * This is a global struct for storing common data for all the devices
@@ -1981,6 +1982,8 @@ static void virtcons_remove(struct virtio_device *vdev)
 
 static int virtcons_validate(struct virtio_device *vdev)
 {
+	u32 max_nr_ports;
+
 	if (is_rproc_serial(vdev)) {
 		/* Don't test F_SIZE at all if we're rproc: not a
 		 * valid feature! */
@@ -1999,6 +2002,13 @@ static int virtcons_validate(struct virtio_device *vdev)
 		return -EINVAL;
 	}
 
+	if (virtio_cread_feature(vdev, VIRTIO_CONSOLE_F_MULTIPORT,
+				 struct virtio_console_config, max_nr_ports,
+				 &max_nr_ports) == 0) {
+		if (max_nr_ports == 0 || max_nr_ports > VIRTCONS_MAX_PORTS)
+			__virtio_clear_bit(vdev, VIRTIO_CONSOLE_F_MULTIPORT);
+	}
+
 	return 0;
 }
 
-- 
2.25.1

_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

  parent reply	other threads:[~2021-10-12  6:53 UTC|newest]

Thread overview: 87+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-12  6:52 [PATCH V2 00/12] More virtio hardening Jason Wang
2021-10-12  6:52 ` Jason Wang
2021-10-12  6:52 ` [PATCH V2 01/12] virtio-blk: validate num_queues during probe Jason Wang
2021-10-12  6:52   ` Jason Wang
2021-10-13 10:04   ` Michael S. Tsirkin
2021-10-13 10:04     ` Michael S. Tsirkin
2021-10-14  2:32     ` Jason Wang
2021-10-14  2:32       ` Jason Wang
2021-10-14  5:45       ` Michael S. Tsirkin
2021-10-14  5:45         ` Michael S. Tsirkin
2021-10-14  6:23         ` Jason Wang
2021-10-14  6:23           ` Jason Wang
2021-10-12  6:52 ` [PATCH V2 02/12] virtio: add doc for validate() method Jason Wang
2021-10-12  6:52   ` Jason Wang
2021-10-13 10:09   ` Michael S. Tsirkin
2021-10-13 10:09     ` Michael S. Tsirkin
2021-10-14  2:32     ` Jason Wang
2021-10-14  2:32       ` Jason Wang
2021-10-12  6:52 ` [PATCH V2 03/12] virtio-console: switch to use .validate() Jason Wang
2021-10-12  6:52   ` Jason Wang
2021-10-13  9:50   ` Michael S. Tsirkin
2021-10-13  9:50     ` Michael S. Tsirkin
2021-10-14  2:28     ` Jason Wang
2021-10-14  2:28       ` Jason Wang
2021-10-14  5:58       ` Michael S. Tsirkin
2021-10-14  5:58         ` Michael S. Tsirkin
2021-10-12  6:52 ` Jason Wang [this message]
2021-10-12  6:52   ` [PATCH V2 04/12] virtio_console: validate max_nr_ports before trying to use it Jason Wang
2021-10-12  6:52 ` [PATCH V2 05/12] virtio_config: introduce a new ready method Jason Wang
2021-10-12  6:52   ` Jason Wang
2021-10-13  9:57   ` Michael S. Tsirkin
2021-10-13  9:57     ` Michael S. Tsirkin
2021-10-12  6:52 ` [PATCH V2 06/12] virtio_pci: harden MSI-X interrupts Jason Wang
2021-10-12  6:52   ` Jason Wang
2021-10-13  9:59   ` Michael S. Tsirkin
2021-10-13  9:59     ` Michael S. Tsirkin
2021-10-14  2:29     ` Jason Wang
2021-10-14  2:29       ` Jason Wang
2021-10-15 12:09   ` Dongli Zhang
2021-10-15 12:09     ` Dongli Zhang
2021-10-15 17:27     ` Michael S. Tsirkin
2021-10-15 17:27       ` Michael S. Tsirkin
2021-10-19  1:33       ` Jason Wang
2021-10-19  1:33         ` Jason Wang
2021-10-19 17:01         ` Dongli Zhang
2021-10-19 17:01           ` Dongli Zhang
2021-10-20  1:33           ` Jason Wang
2021-10-20  1:33             ` Jason Wang
2021-10-20  6:56             ` Michael S. Tsirkin
2021-10-20  6:56               ` Michael S. Tsirkin
2021-10-12  6:52 ` [PATCH V2 07/12] virtio-pci: harden INTX interrupts Jason Wang
2021-10-12  6:52   ` Jason Wang
2021-10-13  9:42   ` Michael S. Tsirkin
2021-10-13  9:42     ` Michael S. Tsirkin
2021-10-14  2:35     ` Jason Wang
2021-10-14  2:35       ` Jason Wang
2021-10-14  5:49       ` Michael S. Tsirkin
2021-10-14  5:49         ` Michael S. Tsirkin
2021-10-14  6:20         ` Jason Wang
2021-10-14  6:20           ` Jason Wang
2021-10-14  6:26           ` Michael S. Tsirkin
2021-10-14  6:26             ` Michael S. Tsirkin
2021-10-14  6:32             ` Jason Wang
2021-10-14  6:32               ` Jason Wang
2021-10-14  7:04               ` Michael S. Tsirkin
2021-10-14  7:04                 ` Michael S. Tsirkin
2021-10-14  7:12                 ` Jason Wang
2021-10-14  7:12                   ` Jason Wang
2021-10-14  9:25                   ` Michael S. Tsirkin
2021-10-14  9:25                     ` Michael S. Tsirkin
2021-10-14 10:03                     ` Jason Wang
2021-10-14 10:03                       ` Jason Wang
2021-10-12  6:52 ` [PATCH V2 08/12] virtio_ring: fix typos in vring_desc_extra Jason Wang
2021-10-12  6:52   ` Jason Wang
2021-10-12  6:52 ` [PATCH V2 09/12] virtio_ring: validate used buffer length Jason Wang
2021-10-12  6:52   ` Jason Wang
2021-10-13 10:02   ` Michael S. Tsirkin
2021-10-13 10:02     ` Michael S. Tsirkin
2021-10-14  2:30     ` Jason Wang
2021-10-14  2:30       ` Jason Wang
2021-10-12  6:52 ` [PATCH V2 10/12] virtio-net: don't let virtio core to validate used length Jason Wang
2021-10-12  6:52   ` Jason Wang
2021-10-12  6:52 ` [PATCH V2 11/12] virtio-blk: " Jason Wang
2021-10-12  6:52   ` Jason Wang
2021-10-12  6:52 ` [PATCH V2 12/12] virtio-scsi: don't let virtio core to validate used buffer length Jason Wang
2021-10-12  6:52   ` Jason Wang
2021-10-12 21:09 [PATCH V2 04/12] virtio_console: validate max_nr_ports before trying to use it kernel test robot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211012065227.9953-5-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=amit@kernel.org \
    --cc=david.kaplan@amd.com \
    --cc=f.hetzelt@tu-berlin.de \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=virtualization@lists.linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.