summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2019-08-20 12:46:56 -0400
committerFrans Kaashoek <[email protected]>2019-08-20 12:46:56 -0400
commitd98ddadd79ae45dec44f191986bf59136dd15e88 (patch)
tree1a3cd46a111986e0481de9a1a1d7c27240154d06
parent6005ef5a1c0bb17a3a5da683d95ed9e1e6f44e68 (diff)
downloadxv6-labs-d98ddadd79ae45dec44f191986bf59136dd15e88.tar.gz
xv6-labs-d98ddadd79ae45dec44f191986bf59136dd15e88.tar.bz2
xv6-labs-d98ddadd79ae45dec44f191986bf59136dd15e88.zip
Also release buffer on failed copyout
-rw-r--r--kernel/fs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/fs.c b/kernel/fs.c
index da9bcca..5505408 100644
--- a/kernel/fs.c
+++ b/kernel/fs.c
@@ -470,8 +470,10 @@ readi(struct inode *ip, int user_dst, uint64 dst, uint off, uint n)
for(tot=0; tot<n; tot+=m, off+=m, dst+=m){
bp = bread(ip->dev, bmap(ip, off/BSIZE));
m = min(n - tot, BSIZE - off%BSIZE);
- if(either_copyout(user_dst, dst, bp->data + (off % BSIZE), m) == -1)
+ if(either_copyout(user_dst, dst, bp->data + (off % BSIZE), m) == -1) {
+ brelse(bp);
break;
+ }
brelse(bp);
}
return n;