Avoid panic when attempting to raw send without large_blocks

Raw sending withouth the feature large_blocks being active is unsupported and leads to a NULL pointer dereference. Handle this gracefully by printing an error. Signed-off-by: George Amanakis <[email protected]>
openzfs · Jul 26, 2021 · e495a24 · e495a24
1 parent d8381f5
commit e495a24
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/module/zfs/dmu_send.c b/module/zfs/dmu_send.c
@@ -1963,8 +1963,14 @@ setup_featureflags(struct dmu_send_params *dspp, objset_t *os,
 	if (dspp->compressok || dspp->rawok)
 		*featureflags |= DMU_BACKUP_FEATURE_COMPRESSED;
 
-	if (dspp->rawok && os->os_encrypted)
+	if (dspp->rawok && os->os_encrypted) {
 		*featureflags |= DMU_BACKUP_FEATURE_RAW;
+		if (!(*featureflags & DMU_BACKUP_FEATURE_LARGE_BLOCKS)) {
+			cmn_err(CE_WARN, "Raw sending without large_blocks "
+			    "active is unsupported.");
+			return (SET_ERROR(ENOTSUP));
+		}
+	}
 
 	if ((*featureflags &
 	    (DMU_BACKUP_FEATURE_EMBED_DATA | DMU_BACKUP_FEATURE_COMPRESSED |