Re: [PATCH] libnsm: safer atomic filenames

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 





On 11/13/24 11:11 AM, Benjamin Coddington wrote:
We've gotten a report of reboot notifications being sent to domains that
end in '.new', which can happen if the NSM temporary pathname code leaves a
file behind.  Let's fix this up by prepending a single '.' to the temp path
which will never be resolvable as a DNS record.

https://lore.kernel.org/linux-nfs/04D30B5A-C53E-4920-ADCB-C77F5577669E@xxxxxxxxxx/T/#t

Reported-by: Philip Rowlands <linux-nfs@xxxxxxxxxxx>
Signed-off-by: Benjamin Coddington <bcodding@xxxxxxxxxx>
Committed... (tag: nfs-utils-2-8-2-rc2)

steved.
---
  support/nsm/file.c | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/support/nsm/file.c b/support/nsm/file.c
index f5b448015751..e0804136ccbe 100644
--- a/support/nsm/file.c
+++ b/support/nsm/file.c
@@ -184,10 +184,10 @@ static char *
  nsm_make_temp_pathname(const char *pathname)
  {
  	size_t size;
-	char *path;
+	char *path, *base;
  	int len;
- size = strlen(pathname) + sizeof(".new") + 2;
+	size = strlen(pathname) + sizeof(".new") + 3;
  	if (size > PATH_MAX)
  		return NULL;
@@ -195,7 +195,11 @@ nsm_make_temp_pathname(const char *pathname)
  	if (path == NULL)
  		return NULL;
- len = snprintf(path, size, "%s.new", pathname);
+	base = strrchr(pathname, '/');
+	strcpy(path, pathname);
+
+	len = base - pathname;
+	len += snprintf(path + len + 1, size-len, ".%s.new", base+1);
  	if (error_check(len, size)) {
  		free(path);
  		return NULL;

base-commit: 38b46cb1f28737069d7887b5ccf7001ba4a4ff59





[Index of Archives]     [Linux Filesystem Development]     [Linux USB Development]     [Linux Media Development]     [Video for Linux]     [Linux NILFS]     [Linux Audio Users]     [Yosemite Info]     [Linux SCSI]

  Powered by Linux