af9854b81

Denis Vlasenko

2006-09-14

SOURCE BUG Duration: 47s

Subject

umount: do not try to close FILE* which is NULL.

SOURCE BUG

This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)

→ Bu hatanin tam hikayesini ve duzeltme diffini gor

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

util-linux/umount.c +13 -11

util-linux/umount.c+13 -11

@@ -59,15 +59,17 @@ int umount_main(int argc, char **argv)

	if (!(fp = setmntent(bb_path_mtab_file, "r"))) {
	if (opt & OPT_ALL)
-	bb_error_msg_and_die("Cannot open %s", bb_path_mtab_file);
-	} else while (getmntent_r(fp,&me,path,sizeof(path))) {
-	m = xmalloc(sizeof(struct mtab_list));
-	m->next = mtl;
-	m->device = xstrdup(me.mnt_fsname);
-	m->dir = xstrdup(me.mnt_dir);
-	mtl = m;
+	bb_error_msg_and_die("cannot open %s", bb_path_mtab_file);
+	} else {
+	while (getmntent_r(fp,&me,path,sizeof(path))) {
+	m = xmalloc(sizeof(struct mtab_list));
+	m->next = mtl;
+	m->device = xstrdup(me.mnt_fsname);
+	m->dir = xstrdup(me.mnt_dir);
+	mtl = m;
+	}
+	endmntent(fp);
	}
-	endmntent(fp);

	/* If we're not mounting all, we need at least one argument. */
	if (!(opt & OPT_ALL)) {
@@ -111,13 +113,13 @@ int umount_main(int argc, char **argv)
	// If still can't umount, maybe remount read-only?
	if (curstat && (opt & OPT_REMOUNT) && errno == EBUSY && m) {
	curstat = mount(m->device, zapit, NULL, MS_REMOUNT\|MS_RDONLY, NULL);
-	bb_error_msg(curstat ? "Cannot remount %s read-only" :
+	bb_error_msg(curstat ? "cannot remount %s read-only" :
	"%s busy - remounted read-only", m->device);
	}

	if (curstat) {
	status = EXIT_FAILURE;
-	bb_perror_msg("Couldn't umount %s", zapit);
+	bb_perror_msg("cannot umount %s", zapit);
	} else {
	/* De-allocate the loop device. This ioctl should be ignored on
	* any non-loop block devices. */
@@ -143,7 +145,7 @@ int umount_main(int argc, char **argv)
	free(mtl->device);
	free(mtl->dir);
	free(mtl);
-	mtl=m;
+	mtl = m;
	}
	}