Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cfa805f6 authored by Bart Van Assche's avatar Bart Van Assche Committed by David Teigland
Browse files

dlm: Avoid LVB truncation 



For lockspaces with an LVB length above 64 bytes, avoid truncating
the LVB while exchanging it with another node in the cluster.

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent 696b3d84

fs/dlm/lock.c

+4 −4
Original line number Diff line number Diff line
@@ -2038,8 +2038,8 @@ static void set_lvb_lock_pc(struct dlm_rsb *r, struct dlm_lkb *lkb, 
	b = dlm_lvb_operations[lkb->lkb_grmode + 1][lkb->lkb_rqmode + 1];

	if (b == 1) {

		int len = receive_extralen(ms);

		if (len > DLM_RESNAME_MAXLEN)

			len = DLM_RESNAME_MAXLEN;

		if (len > r->res_ls->ls_lvblen)

			len = r->res_ls->ls_lvblen;

		memcpy(lkb->lkb_lvbptr, ms->m_extra, len);

		lkb->lkb_lvbseq = ms->m_lvbseq;

	}
@@ -3893,8 +3893,8 @@ static int receive_lvb(struct dlm_ls *ls, struct dlm_lkb *lkb, 
		if (!lkb->lkb_lvbptr)

			return -ENOMEM;

		len = receive_extralen(ms);

		if (len > DLM_RESNAME_MAXLEN)

			len = DLM_RESNAME_MAXLEN;

		if (len > ls->ls_lvblen)

			len = ls->ls_lvblen;

		memcpy(lkb->lkb_lvbptr, ms->m_extra, len);

	}

	return 0;