From df64c3a60f439dec81fd7c96690318588520eb87 Mon Sep 17 00:00:00 2001
From: Chong Cai <chongc@google.com>
Date: Thu, 11 Mar 2021 17:01:13 -0800
Subject: Clear Merkle tree files in RuntimeEnable mode

The Merkle tree files need to be cleared before enabling to avoid
redundant content.

PiperOrigin-RevId: 362409591
---
 pkg/sentry/fsimpl/verity/filesystem.go | 17 +++++++++++++++++
 pkg/sentry/fsimpl/verity/verity.go     | 18 ++++++++++++++++++
 2 files changed, 35 insertions(+)

(limited to 'pkg/sentry')

diff --git a/pkg/sentry/fsimpl/verity/filesystem.go b/pkg/sentry/fsimpl/verity/filesystem.go
index 9057d2b4e..6cb1a23e0 100644
--- a/pkg/sentry/fsimpl/verity/filesystem.go
+++ b/pkg/sentry/fsimpl/verity/filesystem.go
@@ -590,6 +590,23 @@ func (fs *filesystem) lookupAndVerifyLocked(ctx context.Context, parent *dentry,
 		return nil, err
 	}
 
+	// Clear the Merkle tree file if they are to be generated at runtime.
+	// TODO(b/182315468): Optimize the Merkle tree generate process to
+	// allow only updating certain files/directories.
+	if fs.allowRuntimeEnable {
+		childMerkleFD, err := vfsObj.OpenAt(ctx, fs.creds, &vfs.PathOperation{
+			Root:  childMerkleVD,
+			Start: childMerkleVD,
+		}, &vfs.OpenOptions{
+			Flags: linux.O_RDWR | linux.O_TRUNC,
+			Mode:  0644,
+		})
+		if err != nil {
+			return nil, err
+		}
+		childMerkleFD.DecRef(ctx)
+	}
+
 	// The dentry needs to be cleaned up if any error occurs. IncRef will be
 	// called if a verity child dentry is successfully created.
 	defer childMerkleVD.DecRef(ctx)
diff --git a/pkg/sentry/fsimpl/verity/verity.go b/pkg/sentry/fsimpl/verity/verity.go
index 24c7331bc..0d9b0ee2c 100644
--- a/pkg/sentry/fsimpl/verity/verity.go
+++ b/pkg/sentry/fsimpl/verity/verity.go
@@ -311,6 +311,24 @@ func (fstype FilesystemType) GetFilesystem(ctx context.Context, vfsObj *vfs.Virt
 		d.DecRef(ctx)
 		return nil, nil, alertIntegrityViolation("Failed to find root Merkle file")
 	}
+
+	// Clear the Merkle tree file if they are to be generated at runtime.
+	// TODO(b/182315468): Optimize the Merkle tree generate process to
+	// allow only updating certain files/directories.
+	if fs.allowRuntimeEnable {
+		lowerMerkleFD, err := vfsObj.OpenAt(ctx, fs.creds, &vfs.PathOperation{
+			Root:  lowerMerkleVD,
+			Start: lowerMerkleVD,
+		}, &vfs.OpenOptions{
+			Flags: linux.O_RDWR | linux.O_TRUNC,
+			Mode:  0644,
+		})
+		if err != nil {
+			return nil, nil, err
+		}
+		lowerMerkleFD.DecRef(ctx)
+	}
+
 	d.lowerMerkleVD = lowerMerkleVD
 
 	// Get metadata from the underlying file system.
-- 
cgit v1.2.3