Merge release-20210906.0-22-g39470428d (automated)

1 files changed, 11 insertions, 1 deletions

diff --git a/pkg/sentry/kernel/msgqueue/msgqueue.go b/pkg/sentry/kernel/msgqueue/msgqueue.go
index 7c459d076..c7c5e41fb 100644
--- a/pkg/sentry/kernel/msgqueue/msgqueue.go
+++ b/pkg/sentry/kernel/msgqueue/msgqueue.go
@@ -129,6 +129,16 @@ type Message struct {
 	Size uint64
 }
 
+func (m *Message) makeCopy() *Message {
+	new := &Message{
+		Type: m.Type,
+		Size: m.Size,
+	}
+	new.Text = make([]byte, len(m.Text))
+	copy(new.Text, m.Text)
+	return new
+}
+
 // Blocker is used for blocking Queue.Send, and Queue.Receive calls that serves
 // as an abstracted version of kernel.Task. kernel.Task is not directly used to
 // prevent circular dependencies.
@@ -455,7 +465,7 @@ func (q *Queue) Copy(mType int64) (*Message, error) {
 	if msg == nil {
 		return nil, linuxerr.ENOMSG
 	}
-	return msg, nil
+	return msg.makeCopy(), nil
 }
 
 // msgOfType returns the first message with the specified type, nil if no