[Cluster-devel] Cluster Project branch, master, updated. gfs-kernel_0_1_22-70-g5c00e23

[Cluster-devel] Cluster Project branch, master, updated. gfs-kernel_0_1_22-70-g5c00e23

[ccaulfield]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=5c00e231b21d2b8e0be1b4dd028122313e603597

The branch, master has been updated
       via  5c00e231b21d2b8e0be1b4dd028122313e603597 (commit)
      from  674aec455c8f4506c390532276d1392aa017f1b6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5c00e231b21d2b8e0be1b4dd028122313e603597
Author: Christine Caulfield <ccaulfie@redhat.com>
Date:   Thu Mar 13 16:39:38 2008 +0000

    [DLM] Don't segfault if lvbptr is NULL
    
    Calling dlm_lock* with  LKF_VALBLK and sb_lvbptr set
    to NULL could cause libdlm to segfault.
    
    Now it returns -1/EINVAL
    
    Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 dlm/lib/libdlm.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/dlm/lib/libdlm.c b/dlm/lib/libdlm.c
index 28a3cc7..7464085 100644
--- a/dlm/lib/libdlm.c
+++ b/dlm/lib/libdlm.c
@@ -889,6 +889,11 @@ static int ls_lock(dlm_lshandle_t ls,
 		return -1;
 	}
 
+	if (flags & LKF_VALBLK && !lksb->sb_lvbptr) {
+		errno = EINVAL;
+		return -1;
+	}
+
 	if (kernel_version.version[0] == 5)
 		return ls_lock_v5(ls, mode, lksb, flags, name, namelen, parent,
 				  astaddr, astarg, bastaddr);


hooks/post-receive
--
Cluster Project