diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-19 13:18:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-19 13:18:05 -0700 |
| commit | 2decd5a7cea2c1dae6418fe778857d43680a91aa (patch) | |
| tree | 2ff5a57ef9db7a5fc000d323910b13ece778ab5b /drivers | |
| parent | b4fd4f890bca2291a12bb0807027db40f929a82d (diff) | |
| parent | 878c495644be28cc881e7ee792f00fd879a1ebf9 (diff) | |
| download | linux-2decd5a7cea2c1dae6418fe778857d43680a91aa.tar.bz2 | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] cio: fix potential overflow in chpid descriptor
[S390] add missing device put
[S390] dasd: use correct label location for diag fba disks
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/s390/block/dasd_devmap.c | 4 | ||||
| -rw-r--r-- | drivers/s390/cio/chsc.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c index 34d51dd4c539..bed7b4634ccd 100644 --- a/drivers/s390/block/dasd_devmap.c +++ b/drivers/s390/block/dasd_devmap.c @@ -948,8 +948,10 @@ static ssize_t dasd_alias_show(struct device *dev, if (device->discipline && device->discipline->get_uid && !device->discipline->get_uid(device, &uid)) { if (uid.type == UA_BASE_PAV_ALIAS || - uid.type == UA_HYPER_PAV_ALIAS) + uid.type == UA_HYPER_PAV_ALIAS) { + dasd_put_device(device); return sprintf(buf, "1\n"); + } } dasd_put_device(device); diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c index ce7cb87479fe..407d0e9adfaf 100644 --- a/drivers/s390/cio/chsc.c +++ b/drivers/s390/cio/chsc.c @@ -713,7 +713,7 @@ int chsc_determine_base_channel_path_desc(struct chp_id chpid, ret = chsc_determine_channel_path_desc(chpid, 0, 0, 0, 0, chsc_resp); if (ret) goto out_free; - memcpy(desc, &chsc_resp->data, chsc_resp->length); + memcpy(desc, &chsc_resp->data, sizeof(*desc)); out_free: kfree(chsc_resp); return ret; |