chore(bors): merge pull request #1105

1105: fix: reject cross fs restore if fs type is different r=Abhinandan-Purkait a=Abhinandan-Purkait

- While preparing device we ignore the existing fs on the device and went on with format, silently corrupting the existing fs on the device in case of an invalid cross fs restore.

Co-authored-by: Abhinandan Purkait <purkaitabhinandan@gmail.com>

Author: mayastor-bors

.github/workflows/image-pr.yml

@@ -15,5 +15,11 @@ jobs:
         with:
           submodules: 'recursive'
       - uses: cachix/install-nix-action@v31.3.0
+      - name: Pre-populate nix-shell
+        run: |
+          export NIX_PATH=nixpkgs=$(jq '.nixpkgs.url' nix/sources.json -r)
+          echo "NIX_PATH=$NIX_PATH" >> $GITHUB_ENV
+          nix-shell --run "echo" shell.nix
+
       - name: Test building the release images
-        run: ./scripts/release.sh --skip-publish --build-bins
+        run: nix-shell --run "./scripts/release.sh --skip-publish --build-bins"

control-plane/csi-driver/src/bin/node/format.rs

@@ -18,8 +18,13 @@ pub(crate) async fn prepare_device(
 
     let fs_ops = fstype.fs_ops()?;
 
-    if let Ok(fs) = fs {
-        debug!("Found existing filesystem ({}) on device {}", fs, device);
+    if let Ok(ref found_fs) = fs {
+        debug!("Found existing filesystem ({found_fs}) on device {device}");
+        if found_fs != fstype.as_ref() {
+            return Err(format!(
+                "device {device} has filesystem {found_fs} but {fstype} was requested; cross-filesystem restores are not supported"
+            ));
+        }
         if let Some(fs_id) = fs_id {
             debug!("Attempting to set uuid for filesystem {fs_id}, device: {device}");
             fs_ops