Commit a517cca
[media] media: vb2: Fix potential deadlock in vb2_prepare_buffer
Commit b037c0f ("media: vb2: fix
potential deadlock in mmap vs. get_userptr handling") fixes an AB-BA
deadlock related to the mmap_sem and driver locks. The same deadlock can
occur in vb2_prepare_buffer(), fix it the same way.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>1 parent 1ac7fde commit a517cca
1 file changed
+43
-9
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1248 | 1248 | | |
1249 | 1249 | | |
1250 | 1250 | | |
| 1251 | + | |
1251 | 1252 | | |
1252 | 1253 | | |
1253 | 1254 | | |
| 1255 | + | |
| 1256 | + | |
| 1257 | + | |
| 1258 | + | |
| 1259 | + | |
| 1260 | + | |
| 1261 | + | |
| 1262 | + | |
| 1263 | + | |
| 1264 | + | |
| 1265 | + | |
| 1266 | + | |
| 1267 | + | |
| 1268 | + | |
| 1269 | + | |
| 1270 | + | |
| 1271 | + | |
| 1272 | + | |
| 1273 | + | |
| 1274 | + | |
| 1275 | + | |
| 1276 | + | |
| 1277 | + | |
1254 | 1278 | | |
1255 | 1279 | | |
1256 | | - | |
| 1280 | + | |
| 1281 | + | |
1257 | 1282 | | |
1258 | 1283 | | |
1259 | 1284 | | |
1260 | 1285 | | |
1261 | | - | |
| 1286 | + | |
| 1287 | + | |
1262 | 1288 | | |
1263 | 1289 | | |
1264 | 1290 | | |
1265 | 1291 | | |
1266 | | - | |
| 1292 | + | |
| 1293 | + | |
1267 | 1294 | | |
1268 | 1295 | | |
1269 | 1296 | | |
1270 | 1297 | | |
1271 | 1298 | | |
1272 | 1299 | | |
1273 | | - | |
| 1300 | + | |
| 1301 | + | |
1274 | 1302 | | |
1275 | 1303 | | |
1276 | 1304 | | |
1277 | 1305 | | |
1278 | | - | |
| 1306 | + | |
| 1307 | + | |
1279 | 1308 | | |
1280 | 1309 | | |
1281 | 1310 | | |
1282 | 1311 | | |
1283 | | - | |
| 1312 | + | |
| 1313 | + | |
1284 | 1314 | | |
1285 | 1315 | | |
1286 | 1316 | | |
1287 | | - | |
| 1317 | + | |
| 1318 | + | |
1288 | 1319 | | |
1289 | 1320 | | |
1290 | | - | |
| 1321 | + | |
1291 | 1322 | | |
1292 | 1323 | | |
1293 | 1324 | | |
1294 | | - | |
| 1325 | + | |
| 1326 | + | |
| 1327 | + | |
| 1328 | + | |
1295 | 1329 | | |
1296 | 1330 | | |
1297 | 1331 | | |
| |||
0 commit comments