diff options
| author |   Eric Farman <farman@linux.ibm.com> | 2018-11-09 03:39:29 +0100 |
|---|---|---|
| committer |   Cornelia Huck <cohuck@redhat.com> | 2018-11-13 11:45:17 +0100 |
| commit | b89e242eee8d4cd8261d8d821c62c5d1efc454d0 (patch) | |
| tree | 9fb429162b6b9f9309fd9a0921579127212779ee /drivers/s390/cio/vfio_ccw_cp.c | |
| parent | s390/cio: Fix cleanup of pfn_array alloc failure (diff) | |
| download | linux-dev-b89e242eee8d4cd8261d8d821c62c5d1efc454d0.tar.xz linux-dev-b89e242eee8d4cd8261d8d821c62c5d1efc454d0.zip | |
s390/cio: Fix cleanup when unsupported IDA format is used
Direct returns from within a loop are rude, but it doesn't mean it gets
to avoid releasing the memory acquired beforehand.
Signed-off-by: Eric Farman <farman@linux.ibm.com>
Message-Id: <20181109023937.96105-3-farman@linux.ibm.com>
Reviewed-by: Farhan Ali <alifm@linux.ibm.com>
Reviewed-by: Pierre Morel <pmorel@linux.ibm.com>
Acked-by: Halil Pasic <pasic@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'drivers/s390/cio/vfio_ccw_cp.c')
| -rw-r--r-- | drivers/s390/cio/vfio_ccw_cp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/s390/cio/vfio_ccw_cp.c b/drivers/s390/cio/vfio_ccw_cp.c index ef5ab45d94b3..70a006ba4d05 100644 --- a/drivers/s390/cio/vfio_ccw_cp.c +++ b/drivers/s390/cio/vfio_ccw_cp.c @@ -387,8 +387,10 @@ static int ccwchain_calc_length(u64 iova, struct channel_program *cp) * orb specified one of the unsupported formats, we defer * checking for IDAWs in unsupported formats to here. */ - if ((!cp->orb.cmd.c64 || cp->orb.cmd.i2k) && ccw_is_idal(ccw)) + if ((!cp->orb.cmd.c64 || cp->orb.cmd.i2k) && ccw_is_idal(ccw)) { + kfree(p); return -EOPNOTSUPP; + } if ((!ccw_is_chain(ccw)) && (!ccw_is_tic(ccw))) break; |