diff --git a/0001-glusterfsd-Dereferencing-the-null-pointer.patch b/0001-glusterfsd-Dereferencing-the-null-pointer.patch deleted file mode 100644 index eabad8a..0000000 --- a/0001-glusterfsd-Dereferencing-the-null-pointer.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 87bd25b64ae34cce95e87e724acfeab4c13d60a4 Mon Sep 17 00:00:00 2001 -From: Sanju Rakonde -Date: Wed, 18 Oct 2017 08:06:24 +0530 -Subject: [PATCH] glusterfsd: Dereferencing the null pointer - -Problem: When control reaches to out, one of (iobref, iobuf, frame) can -be null.for iobref, iobuf iobref_unref() and iobuf_unref() functions -are called respectively, which are using GF_VALIDATE_OR_GOTO(), so -there won't be null pointer dereference. But for frame without null -checking STACK_DESTROY(frame->root) is called causing null pointer -dereference. - -Fix: adding a line for null checking, the function -STACK_DESTROY(frame->root) is called only when frame is not null. - -Change-Id: I3a6684c11fb7b694b81d6ad4fec3bced5562ad88 -BUG: 1503394 -Signed-off-by: Sanju Rakonde ---- - glusterfsd/src/gf_attach.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/glusterfsd/src/gf_attach.c b/glusterfsd/src/gf_attach.c -index 05119e4f4..3f248292d 100644 ---- a/glusterfsd/src/gf_attach.c -+++ b/glusterfsd/src/gf_attach.c -@@ -144,7 +144,8 @@ out: - - iobref_unref (iobref); - iobuf_unref (iobuf); -- STACK_DESTROY (frame->root); -+ if (frame) -+ STACK_DESTROY (frame->root); - - if (rpc_status != 0) { - fprintf (stderr, "got error %d on RPC\n", rpc_status); --- -2.13.5 - diff --git a/glusterfs.spec b/glusterfs.spec index cc0ba49..b33f9c5 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -179,7 +179,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.13.0 +Version: 3.13.1 Release: %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ @@ -1397,6 +1397,9 @@ exit 0 %endif %changelog +* Thu Dec 21 2017 Kaleb S. KEITHLEY - 3.13.1-1 +- 3.13.1 GA + * Sat Dec 2 2017 Kaleb S. KEITHLEY - 3.13.0-1 - 3.13.0 GA diff --git a/sources b/sources index 9dda890..1b71241 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-3.13.0.tar.gz) = 36d89866658ed10b84ba38a1d7f2afd90f1b7fcc5e40f7e8a2c8e1d05e5b282e7f4e9e20dbe64e093b997a05f884563b8b57aef9ed6b17d61400275c3553c5e1 +SHA512 (glusterfs-3.13.1.tar.gz) = 74685a070d96c4e4250435bd915d1f8d18221c044cbfa9ed01a552c3b5d2450022d1a552de7cdf1f3834c747f1e88118a56348a2b66d19027a4794d25f7c5187