Skip to content

[SPARK-54489][CORE] Avoid returning corrupted Kryo objects #53193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[SPARK-54489][CORE] Avoid returning corrupted Kryo objects #53193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,16 @@ class KryoSerializationStream(

private[this] var kryo: Kryo = serInstance.borrowKryo()

private[this] var kryoCorrupted: Boolean = false

override def writeObject[T: ClassTag](t: T): SerializationStream = {
kryo.writeClassAndObject(output, t)
try {
kryo.writeClassAndObject(output, t)
} catch {
case e: NegativeArraySizeException =>
kryoCorrupted = true
throw e
}
this
}

Expand All @@ -298,7 +306,9 @@ class KryoSerializationStream(
try {
output.close()
} finally {
serInstance.releaseKryo(kryo)
if (!kryoCorrupted) {
serInstance.releaseKryo(kryo)
}
kryo = null
output = null
}
Expand Down Expand Up @@ -445,6 +455,7 @@ private[spark] class KryoSerializerInstance(
override def serialize[T: ClassTag](t: T): ByteBuffer = {
output.clear()
val kryo = borrowKryo()
var kryoCorrupted = false
try {
kryo.writeClassAndObject(output, t)
} catch {
Expand All @@ -455,8 +466,13 @@ private[spark] class KryoSerializerInstance(
"exceptionMsg" -> e.getMessage,
"bufferSizeConfKey" -> KRYO_SERIALIZER_MAX_BUFFER_SIZE.key),
cause = e)
case e: NegativeArraySizeException =>
kryoCorrupted = true
throw e
} finally {
releaseKryo(kryo)
if (!kryoCorrupted) {
releaseKryo(kryo)
}
}
ByteBuffer.wrap(output.toBytes)
}
Expand Down