mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2025-03-11 22:13:10 +03:00
61152d1069
Currently, the handling for errata #4 has two issues which allow the checks for this issue to be bypassed using resumable sends. The first issue is that drc->drc_fromsnapobj is not set in the resuming code as it is in the non-resuming code. This causes dsl_crypto_recv_key_check() to skip its checks for the from_ivset_guid. The second issue is that resumable sends do not clean up their on-disk state if they fail the checks in dmu_recv_stream() that happen before any data is received. As a result of these two bugs, a user can attempt a resumable send of a dataset without a from_ivset_guid. This will fail the initial dmu_recv_stream() checks, leaving a valid resume state. The send can then be resumed, which skips those checks, allowing the receive to be completed. This commit fixes these issues by setting drc->drc_fromsnapobj in the resuming receive path and by ensuring that resumablereceives are properly cleaned up if they fail the initial dmu_recv_stream() checks. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Tom Caputi <tcaputi@datto.com> Closes #9818 Closes #9829
93 lines
2.9 KiB
C
93 lines
2.9 KiB
C
/*
|
|
* CDDL HEADER START
|
|
*
|
|
* The contents of this file are subject to the terms of the
|
|
* Common Development and Distribution License (the "License").
|
|
* You may not use this file except in compliance with the License.
|
|
*
|
|
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
|
|
* or http://www.opensolaris.org/os/licensing.
|
|
* See the License for the specific language governing permissions
|
|
* and limitations under the License.
|
|
*
|
|
* When distributing Covered Code, include this CDDL HEADER in each
|
|
* file and include the License file at usr/src/OPENSOLARIS.LICENSE.
|
|
* If applicable, add the following below this CDDL HEADER, with the
|
|
* fields enclosed by brackets "[]" replaced with your own identifying
|
|
* information: Portions Copyright [yyyy] [name of copyright owner]
|
|
*
|
|
* CDDL HEADER END
|
|
*/
|
|
|
|
/*
|
|
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
|
* Copyright (c) 2012, 2018 by Delphix. All rights reserved.
|
|
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
|
|
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
|
|
*/
|
|
|
|
#ifndef _DMU_RECV_H
|
|
#define _DMU_RECV_H
|
|
|
|
#include <sys/inttypes.h>
|
|
#include <sys/dsl_bookmark.h>
|
|
#include <sys/dsl_dataset.h>
|
|
#include <sys/spa.h>
|
|
#include <sys/objlist.h>
|
|
#include <sys/dsl_bookmark.h>
|
|
|
|
extern const char *recv_clone_name;
|
|
|
|
typedef struct dmu_recv_cookie {
|
|
struct dsl_dataset *drc_ds;
|
|
struct dmu_replay_record *drc_drr_begin;
|
|
struct drr_begin *drc_drrb;
|
|
const char *drc_tofs;
|
|
const char *drc_tosnap;
|
|
boolean_t drc_newfs;
|
|
boolean_t drc_byteswap;
|
|
uint64_t drc_featureflags;
|
|
boolean_t drc_force;
|
|
boolean_t drc_resumable;
|
|
boolean_t drc_should_save;
|
|
boolean_t drc_raw;
|
|
boolean_t drc_clone;
|
|
boolean_t drc_spill;
|
|
struct avl_tree *drc_guid_to_ds_map;
|
|
nvlist_t *drc_keynvl;
|
|
uint64_t drc_fromsnapobj;
|
|
uint64_t drc_newsnapobj;
|
|
uint64_t drc_ivset_guid;
|
|
void *drc_owner;
|
|
cred_t *drc_cred;
|
|
nvlist_t *drc_begin_nvl;
|
|
|
|
objset_t *drc_os;
|
|
zfs_file_t *drc_fp; /* The file to read the stream from */
|
|
uint64_t drc_voff; /* The current offset in the stream */
|
|
uint64_t drc_bytes_read;
|
|
/*
|
|
* A record that has had its payload read in, but hasn't yet been handed
|
|
* off to the worker thread.
|
|
*/
|
|
struct receive_record_arg *drc_rrd;
|
|
/* A record that has had its header read in, but not its payload. */
|
|
struct receive_record_arg *drc_next_rrd;
|
|
zio_cksum_t drc_cksum;
|
|
zio_cksum_t drc_prev_cksum;
|
|
int drc_err;
|
|
/* Sorted list of objects not to issue prefetches for. */
|
|
objlist_t *drc_ignore_objlist;
|
|
} dmu_recv_cookie_t;
|
|
|
|
int dmu_recv_begin(char *tofs, char *tosnap, dmu_replay_record_t *drr_begin,
|
|
boolean_t force, boolean_t resumable, nvlist_t *localprops,
|
|
nvlist_t *hidden_args, char *origin, dmu_recv_cookie_t *drc,
|
|
zfs_file_t *fp, offset_t *voffp);
|
|
int dmu_recv_stream(dmu_recv_cookie_t *drc, int cleanup_fd,
|
|
uint64_t *action_handlep, offset_t *voffp);
|
|
int dmu_recv_end(dmu_recv_cookie_t *drc, void *owner);
|
|
boolean_t dmu_objset_is_receiving(objset_t *os);
|
|
|
|
#endif /* _DMU_RECV_H */
|