block/nfs: fix nfs_client_open for filesize greater than 1TB

[Qemu-devel] [PATCH for-2.11] block/nfs: fix nfs_client_open for filesize greater than 1TB

Peter Lieven posted 1 patch 6 years, 4 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1511798407-31129-1-git-send-email-pl@kamp.de

Test checkpatch passed

Test docker passed

Test ppc passed

Test s390x passed

block/nfs.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

Expand all Fold all

[Qemu-devel] [PATCH for-2.11] block/nfs: fix nfs_client_open for filesize greater than 1TB

Posted by Peter Lieven 6 years, 4 months ago

DIV_ROUND_UP(st.st_size, BDRV_SECTOR_SIZE) was overflowing ret (int) if
st.st_size is greater than 1TB.

Cc: qemu-stable@nongnu.org
Signed-off-by: Peter Lieven <pl@kamp.de>
---
 block/nfs.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/block/nfs.c b/block/nfs.c
index 337fcd9..effc871 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -1,7 +1,7 @@
 /*
  * QEMU Block driver for native access to files on NFS shares
  *
- * Copyright (c) 2014-2016 Peter Lieven <pl@kamp.de>
+ * Copyright (c) 2014-2017 Peter Lieven <pl@kamp.de>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -496,7 +496,7 @@ out:
 static int64_t nfs_client_open(NFSClient *client, QDict *options,
                                int flags, int open_flags, Error **errp)
 {
-    int ret = -EINVAL;
+    int64_t ret = -EINVAL;
     QemuOpts *opts = NULL;
     Error *local_err = NULL;
     struct stat st;
@@ -686,8 +686,7 @@ static QemuOptsList nfs_create_opts = {
 
 static int nfs_file_create(const char *url, QemuOpts *opts, Error **errp)
 {
-    int ret = 0;
-    int64_t total_size = 0;
+    int64_t ret, total_size;
     NFSClient *client = g_new0(NFSClient, 1);
     QDict *options = NULL;
 
-- 
1.9.1

Re: [Qemu-devel] [PATCH for-2.11] block/nfs: fix nfs_client_open for filesize greater than 1TB

Posted by Max Reitz 6 years, 4 months ago

On 2017-11-27 17:00, Peter Lieven wrote:
> DIV_ROUND_UP(st.st_size, BDRV_SECTOR_SIZE) was overflowing ret (int) if
> st.st_size is greater than 1TB.
> 
> Cc: qemu-stable@nongnu.org
> Signed-off-by: Peter Lieven <pl@kamp.de>
> ---
>  block/nfs.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)

Thanks, applied to my block branch:

https://github.com/XanClic/qemu/commits/block

Max