[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-18-g0484ef9

[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-18-g0484ef9

[teigland]

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=0484ef93e8d09313f8f110d23c2a6a6b4aca2f60

The branch, RHEL5 has been updated
       via  0484ef93e8d09313f8f110d23c2a6a6b4aca2f60 (commit)
      from  d3f69f52ce9c48a7abd4fb89efc3897aac9bb1c4 (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 0484ef93e8d09313f8f110d23c2a6a6b4aca2f60
Author: Christine Caulfield <ccaulfie@redhat.com>
Date:   Thu Mar 13 16:44:00 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 0612d09..2bdbb0f 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