From 72a5b18b9d9553dbbe0f951b44fe084c2db9c3eb Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Sat, 26 Mar 2016 14:34:43 +0100
Subject: [PATCH] cd9660_read(): In case of read errors, don't dereference bp
 which may be NULL

PR: 208275
Obtained from: ElectroBSD
---
 sys/fs/cd9660/cd9660_vnops.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 47d4f75..c6d7cbd 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -341,11 +341,12 @@ cd9660_read(ap)
 			} else
 				error = bread(vp, lbn, size, NOCRED, &bp);
 		}
-		n = MIN(n, size - bp->b_resid);
 		if (error) {
-			brelse(bp);
+			if (bp != NULL)
+				brelse(bp);
 			return (error);
 		}
+		n = MIN(n, size - bp->b_resid);
 
 		error = uiomove(bp->b_data + on, (int)n, uio);
 		brelse(bp);
-- 
2.7.4