diff options
author | Eric Farman <farman@linux.ibm.com> | 2018-11-08 21:39:29 -0500 |
---|---|---|
committer | Cornelia Huck <cohuck@redhat.com> | 2018-11-13 05:45:17 -0500 |
commit | b89e242eee8d4cd8261d8d821c62c5d1efc454d0 (patch) | |
tree | 9fb429162b6b9f9309fd9a0921579127212779ee /drivers/s390 | |
parent | 806212f91c874b24cf9eb4a9f180323671b6c5ed (diff) |
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')
-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) | |||
387 | * orb specified one of the unsupported formats, we defer | 387 | * orb specified one of the unsupported formats, we defer |
388 | * checking for IDAWs in unsupported formats to here. | 388 | * checking for IDAWs in unsupported formats to here. |
389 | */ | 389 | */ |
390 | if ((!cp->orb.cmd.c64 || cp->orb.cmd.i2k) && ccw_is_idal(ccw)) | 390 | if ((!cp->orb.cmd.c64 || cp->orb.cmd.i2k) && ccw_is_idal(ccw)) { |
391 | kfree(p); | ||
391 | return -EOPNOTSUPP; | 392 | return -EOPNOTSUPP; |
393 | } | ||
392 | 394 | ||
393 | if ((!ccw_is_chain(ccw)) && (!ccw_is_tic(ccw))) | 395 | if ((!ccw_is_chain(ccw)) && (!ccw_is_tic(ccw))) |
394 | break; | 396 | break; |