From: Alexander Aring <aahringo@redhat.com>
Date: Tue, 1 Aug 2023 18:09:46 +0000 (-0400)
Subject: fs: dlm: drop rxbuf manipulation in dlm_copy_master_names
X-Git-Tag: v6.6-rc1~112^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=561c67d8a10142250baa2a2a4e8b5d95e9c97df9;p=thirdparty%2Fkernel%2Flinux.git

fs: dlm: drop rxbuf manipulation in dlm_copy_master_names

This patch removes the manipulation of the receive buffer in case of an
error and be sure the buffer is null terminated before an error
messagea is printed out. Instead of manipulate the receive buffer we
tell inside the format string the maximum length the string buffer is
being read.

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

diff --git a/fs/dlm/dir.c b/fs/dlm/dir.c
index 3bf5bf7a37b4e..768cf8d43b2b4 100644
--- a/fs/dlm/dir.c
+++ b/fs/dlm/dir.c
@@ -245,9 +245,8 @@ void dlm_copy_master_names(struct dlm_ls *ls, char *inbuf, int inlen,
 	if (inlen > 1) {
 		r = find_rsb_root(ls, inbuf, inlen);
 		if (!r) {
-			inbuf[inlen - 1] = '\0';
-			log_error(ls, "copy_master_names from %d start %d %s",
-				  nodeid, inlen, inbuf);
+			log_error(ls, "copy_master_names from %d start %d %.*s",
+				  nodeid, inlen, inlen, inbuf);
 			goto out;
 		}
 		list = r->res_root_list.next;