Skip to content

Commit 83fa3f7

Browse files
committed
Added error for writing to /dev/ on Linux
Starting in Linux 5.10, trying to write to /dev/{null,zero} errors out. Prefer to inform people when this happens rather than hoping they guess what's wrong. Signed-off-by: Rich Ercolani <[email protected]>
1 parent 8d5f211 commit 83fa3f7

File tree

2 files changed

+35
-2
lines changed

2 files changed

+35
-2
lines changed

cmd/zfs/zfs_main.c

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -728,6 +728,30 @@ finish_progress(char *done)
728728
pt_header = NULL;
729729
}
730730

731+
/* This function checks if the passed fd refers to /dev/null or /dev/zero */
732+
#ifdef __linux__
733+
static boolean_t
734+
is_dev_nullzero(int fd)
735+
{
736+
struct stat st;
737+
fstat(fd, &st);
738+
return (major(st.st_rdev) == 1 && (minor(st.st_rdev) == 3 /* null */ ||
739+
minor(st.st_rdev) == 5 /* zero */));
740+
}
741+
#endif
742+
743+
static void
744+
note_dev_error(int err, int fd)
745+
{
746+
#ifdef __linux__
747+
if (err == EINVAL && is_dev_nullzero(fd)) {
748+
(void) fprintf(stderr,
749+
gettext("Error: Stream cannot be written to "
750+
"/dev/{null,zero} files.\n"));
751+
}
752+
#endif
753+
}
754+
731755
static int
732756
zfs_mount_and_share(libzfs_handle_t *hdl, const char *dataset, zfs_type_t type)
733757
{
@@ -4572,11 +4596,16 @@ zfs_do_send(int argc, char **argv)
45724596

45734597
err = zfs_send_saved(zhp, &flags, STDOUT_FILENO,
45744598
resume_token);
4599+
if (err != 0)
4600+
note_dev_error(errno, STDOUT_FILENO);
45754601
zfs_close(zhp);
45764602
return (err != 0);
45774603
} else if (resume_token != NULL) {
4578-
return (zfs_send_resume(g_zfs, &flags, STDOUT_FILENO,
4579-
resume_token));
4604+
err = zfs_send_resume(g_zfs, &flags, STDOUT_FILENO,
4605+
resume_token);
4606+
if (err != 0)
4607+
note_dev_error(errno, STDOUT_FILENO);
4608+
return (err);
45804609
}
45814610

45824611
if (flags.skipmissing && !flags.replicate) {
@@ -4627,6 +4656,8 @@ zfs_do_send(int argc, char **argv)
46274656
err = zfs_send_one(zhp, fromname, STDOUT_FILENO, &flags,
46284657
redactbook);
46294658
zfs_close(zhp);
4659+
if (err != 0)
4660+
note_dev_error(errno, STDOUT_FILENO);
46304661
return (err != 0);
46314662
}
46324663

@@ -4703,6 +4734,7 @@ zfs_do_send(int argc, char **argv)
47034734
nvlist_free(dbgnv);
47044735
}
47054736
zfs_close(zhp);
4737+
note_dev_error(errno, STDOUT_FILENO);
47064738

47074739
return (err != 0);
47084740
}

lib/libzfs/libzfs_sendrecv.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -849,6 +849,7 @@ dump_ioctl(zfs_handle_t *zhp, const char *fromsnap, uint64_t fromsnap_obj,
849849
case ERANGE:
850850
case EFAULT:
851851
case EROFS:
852+
case EINVAL:
852853
zfs_error_aux(hdl, "%s", strerror(errno));
853854
return (zfs_error(hdl, EZFS_BADBACKUP, errbuf));
854855

0 commit comments

Comments
 (0)