diff options
| author | Jens Axboe <axboe@fb.com> | 2015-10-07 21:50:17 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-10-07 21:50:17 +0200 |
| commit | c3984cc994377671f18d3d719ddd86b5107457ee (patch) | |
| tree | f7a57a5f4176eb4d20d4c150ee35e70915f15dbd | |
| parent | Merge tag 'regmap-fix-v4.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | xen-blkfront: check for null drvdata in blkback_changed (XenbusStateClosing) (diff) | |
| download | linux-c3984cc994377671f18d3d719ddd86b5107457ee.tar.xz linux-c3984cc994377671f18d3d719ddd86b5107457ee.zip | |
Merge branch 'stable/for-jens-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
Konrad writes:
Please git pull an update branch to your 'for-4.3/drivers' branch (which
oddly I don't see does not have the previous pull?)
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git stable/for-jens-4.3
which has two fixes - one where we use the Xen blockfront EFI driver and
don't release all the requests, the other if the allocation of resources
for a particular state failed - we would go back 'Closing' and assume
that an structure would be allocated while in fact it may not be - and
crash.
| -rw-r--r-- | drivers/block/xen-blkfront.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 611170896b8c..a69c02dadec0 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -1956,7 +1956,8 @@ static void blkback_changed(struct xenbus_device *dev, break; /* Missed the backend's Closing state -- fallthrough */ case XenbusStateClosing: - blkfront_closing(info); + if (info) + blkfront_closing(info); break; } } |