diff options
| author | Ravishankar N <ravishankar@redhat.com> | 2015-04-13 05:47:09 +0000 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-04-17 06:48:16 +0000 |
| commit | 0486c7f40a5813dd50f73c4dc233c55c77b8d958 (patch) | |
| tree | f59e736a22e5b1cfca8cc04dcc37e6222ed67654 /xlators | |
| parent | 56a04936f29a21b7bd277b4b9dc92fea01730c2e (diff) | |
quick-read: Do a null check before unref
Commit 4ea5b8d2046b9e0bc7f24cdf1b2e72ab8b462c9e seems to have removed the check
as a part of static analyis fixes but I'm seeing errors in the client log.
--------------------
touch /mnt/fuse_mnt/zero-byte-file
echo 3 > /proc/sys/vm/drop_caches
cat /mnt/fuse_mnt/zero-byte-file
mount log:
[2015-04-13 05:52:21.683256] E [iobuf.c:790:iobuf_unref] (-->
/usr/local/lib/libglusterfs.so.0(_gf_log_callingfn+0x232)[0x7feda12c0e24] (-->
/usr/local/lib/libglusterfs.so.0(iobuf_unref+0x56)[0x7feda1304c8e] (-->
/usr/local/lib/glusterfs/3.7dev/xlator/performance/quick-read.so(qr_readv_cached+0x466)[0x7fed95b7e2fc]
(-->
/usr/local/lib/glusterfs/3.7dev/xlator/performance/quick-read.so(qr_readv+0x70)[0x7fed95b7e385]
(-->
/usr/local/lib/libglusterfs.so.0(default_readv_resume+0x270)[0x7feda12d4401]
))))) 0-iobuf: invalid argument: iobuf
--------------------
Hence re-adding the checks.
Note: I'm using the same BZ Id used for the original commit though it is in
MODIFIED state just for correlation.
Change-Id: I79749814a9d4082933e3b306ce449492ee5b43a5
BUG: 1109180
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-on: http://review.gluster.org/10206
Tested-by: NetBSD Build System
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Raghavendra Talur <rtalur@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/performance/quick-read/src/quick-read.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xlators/performance/quick-read/src/quick-read.c b/xlators/performance/quick-read/src/quick-read.c index aa44c5d388b..53f9a5d44ce 100644 --- a/xlators/performance/quick-read/src/quick-read.c +++ b/xlators/performance/quick-read/src/quick-read.c @@ -587,9 +587,11 @@ unlock: STACK_UNWIND_STRICT (readv, frame, op_ret, 0, &iov, 1, &buf, iobref, xdata); } - iobuf_unref (iobuf); + if (iobuf) + iobuf_unref (iobuf); - iobref_unref (iobref); + if (iobref) + iobref_unref (iobref); return op_ret; } |