From: David Teigland <teigland@redhat.com>
Date: Thu, 21 Feb 2008 19:39:57 +0000 (-0600)
Subject: dlm: fix rcom_names message to self
X-Git-Tag: v2.6.25-rc3~99^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=599e0f584de8ff16b1428e2e16118757619f1d1b;p=linux-2.6-omap-h63xx.git

dlm: fix rcom_names message to self

The recent patch to validate data lengths in rcom_names messages
failed to account for fake messages a node directs to itself before
ever sending it.  In this case we need to fill in the message length
in the header for the validation code to use.

Signed-off-by: David Teigland <teigland@redhat.com>
---

diff --git a/fs/dlm/rcom.c b/fs/dlm/rcom.c
index 035e6f9990b..67522c268c1 100644
--- a/fs/dlm/rcom.c
+++ b/fs/dlm/rcom.c
@@ -215,6 +215,8 @@ int dlm_rcom_names(struct dlm_ls *ls, int nodeid, char *last_name, int last_len)
 	ls->ls_recover_nodeid = nodeid;
 
 	if (nodeid == dlm_our_nodeid()) {
+		ls->ls_recover_buf->rc_header.h_length =
+			dlm_config.ci_buffer_size;
 		dlm_copy_master_names(ls, last_name, last_len,
 		                      ls->ls_recover_buf->rc_buf,
 		                      max_size, nodeid);