tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tape: SgTapeReader::read_block - disable reading beyond EOF

Browse Source
This commit is contained in:
Dietmar Maurer 2021-04-13 11:44:06 +02:00
parent f281b8d3a9
commit 6a15cce540
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/tape/drive/lto/sg_tape.rs
View File

@ -694,19 +694,30 @@ impl Drop for SgTape {
pub struct SgTapeReader<'a> { pub struct SgTapeReader<'a> {
sg_tape: &'a mut SgTape, sg_tape: &'a mut SgTape,
end_of_file: bool,
} }
impl <'a> SgTapeReader<'a> { impl <'a> SgTapeReader<'a> {
pub fn new(sg_tape: &'a mut SgTape) -> Self { pub fn new(sg_tape: &'a mut SgTape) -> Self {
Self { sg_tape } Self { sg_tape, end_of_file: false, }
} }
} }
impl <'a> BlockRead for SgTapeReader<'a> { impl <'a> BlockRead for SgTapeReader<'a> {
fn read_block(&mut self, buffer: &mut [u8]) -> Result<usize, BlockReadError> { fn read_block(&mut self, buffer: &mut [u8]) -> Result<usize, BlockReadError> {
self.sg_tape.read_block(buffer) if self.end_of_file {
return Err(BlockReadError::Error(proxmox::io_format_err!("detected read after EOF!")));
}
match self.sg_tape.read_block(buffer) {
Ok(usize) => Ok(usize),
Err(BlockReadError::EndOfFile) => {
self.end_of_file = true;
Err(BlockReadError::EndOfFile)
},
Err(err) => Err(err),
}
} }
} }