From 8ea67ac2c93238eb6f5f43ebe29f56680784ccd8 Mon Sep 17 00:00:00 2001
From: Kaleb S KEITHLEY <kkeithle@redhat.com>
Date: Mon, 27 Jun 2016 08:55:16 -0400
Subject: [PATCH] 3.8.0 GA, http://review.gluster.org/#/c/14779/

---
 glusterfs-3.8.0.api.glfs-fops.patch | 23 +++++++++++++++++++++++
 glusterfs.spec                      |  7 ++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 glusterfs-3.8.0.api.glfs-fops.patch

diff --git a/glusterfs-3.8.0.api.glfs-fops.patch b/glusterfs-3.8.0.api.glfs-fops.patch
new file mode 100644
index 0000000..b903562
--- /dev/null
+++ b/glusterfs-3.8.0.api.glfs-fops.patch
@@ -0,0 +1,23 @@
+--- glusterfs-3.8.0/api/src/glfs-fops.c.orig	2016-06-27 08:38:37.523161014 -0400
++++ glusterfs-3.8.0/api/src/glfs-fops.c	2016-06-27 08:40:06.591161014 -0400
+@@ -803,7 +803,6 @@
+ 
+         GF_VALIDATE_OR_GOTO ("gfapi", frame, inval);
+         GF_VALIDATE_OR_GOTO ("gfapi", cookie, inval);
+-        GF_VALIDATE_OR_GOTO ("gfapi", iovec, inval);
+ 
+         gio = frame->local;
+         frame->local = NULL;
+@@ -817,6 +816,12 @@
+         if (op_ret <= 0) {
+                 goto out;
+         } else if (gio->op == GF_FOP_READ) {
++                if (!iovec) {
++                        op_ret = -1;
++                        op_errno = EINVAL;
++                        goto out;
++                }
++
+                 op_ret = iov_copy (gio->iov, gio->count, iovec, count);
+                 glfd->offset = gio->offset + op_ret;
+         } else if (gio->op == GF_FOP_WRITE) {
diff --git a/glusterfs.spec b/glusterfs.spec
index e355d54..133e9e8 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -161,7 +161,7 @@ Summary:          Distributed File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
 Version:          3.8.0
-Release:          2%{?prereltag:.%{prereltag}}%{?dist}
+Release:          3%{?prereltag:.%{prereltag}}%{?dist}
 Vendor:           Fedora Project
 %else
 Name:             @PACKAGE_NAME@
@@ -182,6 +182,7 @@ Source8:          glusterfsd.init
 %else
 Source0:          @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
 %endif
+Patch0:           glusterfs-3.8.0.api.glfs-fops.patch
 
 BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -587,6 +588,7 @@ This package provides the glusterfs server daemon.
 
 %prep
 %setup -q -n %{name}-%{version}%{?prereltag}
+%patch0 -p1
 
 %build
 %if ( 0%{?rhel} && 0%{?rhel} < 6 )
@@ -1206,6 +1208,9 @@ exit 0
 %endif
 
 %changelog
+* Mon Jun 27 2016  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.8.0-3
+- 3.8.0 GA, http://review.gluster.org/#/c/14779/
+
 * Wed Jun 22 2016  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.8.0-2
 - 3.8.0 GA, rebuild after userspace-rcu SONAME bump