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

Commit 3384f3df authored by Mark Fasheh's avatar Mark Fasheh
Browse files

ocfs2: Allow binary names in the DLM 



The OCFS2 DLM uses strlen() to determine lock name length, which excludes
the possibility of putting binary values in the name string. Fix this by
requiring that string length be passed in as a parameter.

Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent e2c73698

fs/ocfs2/dlm/dlmapi.h

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ enum dlm_status dlmlock(struct dlm_ctxt *dlm, 
			struct dlm_lockstatus *lksb,

			int flags,

			const char *name,

			int namelen,

			dlm_astlockfunc_t *ast,

			void *data,

			dlm_bastlockfunc_t *bast);

fs/ocfs2/dlm/dlmcommon.h

+1 −0
Original line number Diff line number Diff line
@@ -747,6 +747,7 @@ void dlm_change_lockres_owner(struct dlm_ctxt *dlm, 
			      u8 owner);

struct dlm_lock_resource * dlm_get_lock_resource(struct dlm_ctxt *dlm,

						 const char *lockid,

						 int namelen,

						 int flags);

struct dlm_lock_resource *dlm_new_lockres(struct dlm_ctxt *dlm,

					  const char *name,

fs/ocfs2/dlm/dlmlock.c

+5 −5
Original line number Diff line number Diff line
@@ -540,8 +540,8 @@ static inline void dlm_get_next_cookie(u8 node_num, u64 *cookie) 


enum dlm_status dlmlock(struct dlm_ctxt *dlm, int mode,

			struct dlm_lockstatus *lksb, int flags,

			const char *name, dlm_astlockfunc_t *ast, void *data,

			dlm_bastlockfunc_t *bast)

			const char *name, int namelen, dlm_astlockfunc_t *ast,

			void *data, dlm_bastlockfunc_t *bast)

{

	enum dlm_status status;

	struct dlm_lock_resource *res = NULL;
@@ -571,7 +571,7 @@ enum dlm_status dlmlock(struct dlm_ctxt *dlm, int mode, 
	recovery = (flags & LKM_RECOVERY);



	if (recovery &&

	    (!dlm_is_recovery_lock(name, strlen(name)) || convert) ) {

	    (!dlm_is_recovery_lock(name, namelen) || convert) ) {

		dlm_error(status);

		goto error;

	}
@@ -643,7 +643,7 @@ enum dlm_status dlmlock(struct dlm_ctxt *dlm, int mode, 
		}



		status = DLM_IVBUFLEN;

		if (strlen(name) > DLM_LOCKID_NAME_MAX || strlen(name) < 1) {

		if (namelen > DLM_LOCKID_NAME_MAX || namelen < 1) {

			dlm_error(status);

			goto error;

		}
@@ -659,7 +659,7 @@ enum dlm_status dlmlock(struct dlm_ctxt *dlm, int mode, 
			dlm_wait_for_recovery(dlm);



		/* find or create the lock resource */

		res = dlm_get_lock_resource(dlm, name, flags);

		res = dlm_get_lock_resource(dlm, name, namelen, flags);

		if (!res) {

			status = DLM_IVLOCKID;

			dlm_error(status);

fs/ocfs2/dlm/dlmmaster.c

+2 −2
Original line number Diff line number Diff line
@@ -740,6 +740,7 @@ struct dlm_lock_resource *dlm_new_lockres(struct dlm_ctxt *dlm, 
 */

struct dlm_lock_resource * dlm_get_lock_resource(struct dlm_ctxt *dlm,

					  const char *lockid,

					  int namelen,

					  int flags)

{

	struct dlm_lock_resource *tmpres=NULL, *res=NULL;
@@ -748,13 +749,12 @@ struct dlm_lock_resource * dlm_get_lock_resource(struct dlm_ctxt *dlm, 
	int blocked = 0;

	int ret, nodenum;

	struct dlm_node_iter iter;

	unsigned int namelen, hash;

	unsigned int hash;

	int tries = 0;

	int bit, wait_on_recovery = 0;



	BUG_ON(!lockid);



	namelen = strlen(lockid);

	hash = dlm_lockid_hash(lockid, namelen);



	mlog(0, "get lockres %s (len %d)\n", lockid, namelen);

fs/ocfs2/dlm/dlmrecovery.c

+2 −1
Original line number Diff line number Diff line
@@ -2285,7 +2285,8 @@ static int dlm_pick_recovery_master(struct dlm_ctxt *dlm) 
	memset(&lksb, 0, sizeof(lksb));



	ret = dlmlock(dlm, LKM_EXMODE, &lksb, LKM_NOQUEUE|LKM_RECOVERY,

		      DLM_RECOVERY_LOCK_NAME, dlm_reco_ast, dlm, dlm_reco_bast);

		      DLM_RECOVERY_LOCK_NAME, DLM_RECOVERY_LOCK_NAME_LEN,

		      dlm_reco_ast, dlm, dlm_reco_bast);



	mlog(0, "%s: dlmlock($RECOVERY) returned %d, lksb=%d\n",

	     dlm->name, ret, lksb.status);