[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/17] block/nfs: limit maximum readahead size to 1MB
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 16/17] block/nfs: limit maximum readahead size to 1MB |
Date: |
Thu, 2 Jul 2015 10:19:48 +0100 |
From: Peter Lieven <address@hidden>
a malicious caller could otherwise specify a very
large value via the URI and force libnfs to allocate
a large amount of memory for the readahead buffer.
Cc: address@hidden
Signed-off-by: Peter Lieven <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/nfs.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/block/nfs.c b/block/nfs.c
index ca9e24e..c026ff6 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -35,6 +35,8 @@
#include "sysemu/sysemu.h"
#include <nfsc/libnfs.h>
+#define QEMU_NFS_MAX_READAHEAD_SIZE 1048576
+
typedef struct NFSClient {
struct nfs_context *context;
struct nfsfh *fh;
@@ -327,6 +329,11 @@ static int64_t nfs_client_open(NFSClient *client, const
char *filename,
nfs_set_tcp_syncnt(client->context, val);
#ifdef LIBNFS_FEATURE_READAHEAD
} else if (!strcmp(qp->p[i].name, "readahead")) {
+ if (val > QEMU_NFS_MAX_READAHEAD_SIZE) {
+ error_report("NFS Warning: Truncating NFS readahead"
+ " size to %d", QEMU_NFS_MAX_READAHEAD_SIZE);
+ val = QEMU_NFS_MAX_READAHEAD_SIZE;
+ }
nfs_set_readahead(client->context, val);
#endif
} else {
--
2.4.3
- [Qemu-devel] [PULL 06/17] timer: Use a single definition of NSEC_PER_SEC for the whole codebase, (continued)
- [Qemu-devel] [PULL 06/17] timer: Use a single definition of NSEC_PER_SEC for the whole codebase, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 07/17] block: Add bdrv_get_block_status_above, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 08/17] qmp: Add optional bool "unmap" to drive-mirror, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 09/17] mirror: Do zero write on target if sectors not allocated, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 10/17] block: Fix dirty bitmap in bdrv_co_discard, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 11/17] block: Remove bdrv_reset_dirty, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 12/17] qemu-iotests: Make block job methods common, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 13/17] qemu-iotests: Add test case for mirror with unmap, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 14/17] iotests: Use event_wait in wait_ready, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 15/17] block/iscsi: restore compatiblity with libiscsi 1.9.0, Stefan Hajnoczi, 2015/07/02
- [Qemu-devel] [PULL 16/17] block/nfs: limit maximum readahead size to 1MB,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 17/17] block: remove redundant check before g_slist_find(), Stefan Hajnoczi, 2015/07/02
- Re: [Qemu-devel] [PULL 00/17] Block patches, Peter Maydell, 2015/07/02
- Re: [Qemu-devel] [PULL 00/17] Block patches, Peter Maydell, 2015/07/07