natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix missing state resetting on CompressedRandomAccessReader read errors 

patch by Runtian Liu; reviewed by Andrés de la Peña and Berenguer Blasi for CASSANDRA-17314
This commit is contained in:
Runtian Liu 2022-06-28 15:52:00 -07:00 committed by Andrés de la Peña
parent a7b53217bd
commit 299bfaed35
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
3.0.28
* Fix missing state resetting on CompressedRandomAccessReader read errors (CASSANDRA-17314)
* Fix restarting of services on gossipping-only member (CASSANDRA-17752)
* Fix writetime and ttl functions forbidden for collections instead of multicell columns (CASSANDRA-17628)
* Supress CVE-2020-7238 (CASSANDRA-17697)

19
src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
View File

@ -118,14 +118,9 @@ public class CompressedRandomAccessReader extends RandomAccessReader
if (getCrcCheckChance() >= 1d ||
getCrcCheckChance() > ThreadLocalRandom.current().nextDouble())
{
metadata.checksumType.update(checksum, (compressed));
if (checksum(chunk) != (int) checksum.getValue())
if (checksum(chunk) != (int) metadata.checksumType.of(compressed))
throw new CorruptBlockException(getPath(), chunk);
// reset checksum object back to the original (blank) state
checksum.reset();
compressed.rewind();
}
@ -152,6 +147,8 @@ public class CompressedRandomAccessReader extends RandomAccessReader
}
catch (CorruptBlockException e)
{
// Make sure reader does not see stale data.
buffer.position(0).limit(0);
throw new CorruptSSTableException(e, getPath());
}
catch (IOException e)
@ -182,15 +179,11 @@ public class CompressedRandomAccessReader extends RandomAccessReader
if (getCrcCheckChance() >= 1d ||
getCrcCheckChance() > ThreadLocalRandom.current().nextDouble())
{
metadata.checksumType.update( checksum, compressedChunk);
int checksum = (int) metadata.checksumType.of(compressedChunk);
compressedChunk.limit(compressedChunk.capacity());
if (compressedChunk.getInt() != (int) checksum.getValue())
if (compressedChunk.getInt() != checksum)
throw new CorruptBlockException(getPath(), chunk);
// reset checksum object back to the original (blank) state
checksum.reset();
compressedChunk.position(chunkOffset).limit(chunkOffset + chunk.length);
}
@ -217,6 +210,8 @@ public class CompressedRandomAccessReader extends RandomAccessReader
}
catch (CorruptBlockException e)
{
// Make sure reader does not see stale data.
buffer.position(0).limit(0);
throw new CorruptSSTableException(e, getPath());
}

18
src/java/org/apache/cassandra/utils/ChecksumType.java
View File

@ -17,6 +17,8 @@
*/
package org.apache.cassandra.utils;
import io.netty.util.concurrent.FastThreadLocal;
import java.nio.ByteBuffer;
import java.util.zip.Checksum;
import java.util.zip.CRC32;
@ -60,4 +62,20 @@ public enum ChecksumType
public abstract Checksum newInstance();
public abstract void update(Checksum checksum, ByteBuffer buf);
private FastThreadLocal<Checksum> instances = new FastThreadLocal<Checksum>()
{
protected Checksum initialValue() throws Exception
{
return newInstance();
}
};
public long of(ByteBuffer buf)
{
Checksum checksum = instances.get();
checksum.reset();
update(checksum, buf);
return checksum.getValue();
}
}