mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-27 21:14:44 +08:00
24c65bc703
The add_early_randomness() function in drivers/char/hw_random/core.c passes
a 16-byte buffer to pseries_rng_data_read(). Unfortunately, plpar_hcall()
returns four 64-bit values and trashes 16 bytes on the stack.
This bug has been lying around for a long time. It got unveiled by:
commit d3cc799647
Author: Amit Shah <amit.shah@redhat.com>
Date: Thu Jul 10 15:42:34 2014 +0530
hwrng: fetch randomness only after device init
It may trig a oops while loading or unloading the pseries-rng module for both
PowerVM and PowerKVM guests.
This patch does two things:
- pass an intermediate well sized buffer to plpar_hcall(). This is acceptalbe
since we're not on a hot path.
- move to the new read API so that we know the return buffer size for sure.
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
107 lines
2.8 KiB
C
107 lines
2.8 KiB
C
/*
|
|
* Copyright (C) 2010 Michael Neuling IBM Corporation
|
|
*
|
|
* Driver for the pseries hardware RNG for POWER7+ and above
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/hw_random.h>
|
|
#include <asm/vio.h>
|
|
|
|
|
|
static int pseries_rng_read(struct hwrng *rng, void *data, size_t max, bool wait)
|
|
{
|
|
u64 buffer[PLPAR_HCALL_BUFSIZE];
|
|
size_t size = max < 8 ? max : 8;
|
|
int rc;
|
|
|
|
rc = plpar_hcall(H_RANDOM, (unsigned long *)buffer);
|
|
if (rc != H_SUCCESS) {
|
|
pr_err_ratelimited("H_RANDOM call failed %d\n", rc);
|
|
return -EIO;
|
|
}
|
|
memcpy(data, buffer, size);
|
|
|
|
/* The hypervisor interface returns 64 bits */
|
|
return size;
|
|
}
|
|
|
|
/**
|
|
* pseries_rng_get_desired_dma - Return desired DMA allocate for CMO operations
|
|
*
|
|
* This is a required function for a driver to operate in a CMO environment
|
|
* but this device does not make use of DMA allocations, return 0.
|
|
*
|
|
* Return value:
|
|
* Number of bytes of IO data the driver will need to perform well -> 0
|
|
*/
|
|
static unsigned long pseries_rng_get_desired_dma(struct vio_dev *vdev)
|
|
{
|
|
return 0;
|
|
};
|
|
|
|
static struct hwrng pseries_rng = {
|
|
.name = KBUILD_MODNAME,
|
|
.read = pseries_rng_read,
|
|
};
|
|
|
|
static int __init pseries_rng_probe(struct vio_dev *dev,
|
|
const struct vio_device_id *id)
|
|
{
|
|
return hwrng_register(&pseries_rng);
|
|
}
|
|
|
|
static int __exit pseries_rng_remove(struct vio_dev *dev)
|
|
{
|
|
hwrng_unregister(&pseries_rng);
|
|
return 0;
|
|
}
|
|
|
|
static struct vio_device_id pseries_rng_driver_ids[] = {
|
|
{ "ibm,random-v1", "ibm,random"},
|
|
{ "", "" }
|
|
};
|
|
MODULE_DEVICE_TABLE(vio, pseries_rng_driver_ids);
|
|
|
|
static struct vio_driver pseries_rng_driver = {
|
|
.name = KBUILD_MODNAME,
|
|
.probe = pseries_rng_probe,
|
|
.remove = pseries_rng_remove,
|
|
.get_desired_dma = pseries_rng_get_desired_dma,
|
|
.id_table = pseries_rng_driver_ids
|
|
};
|
|
|
|
static int __init rng_init(void)
|
|
{
|
|
pr_info("Registering IBM pSeries RNG driver\n");
|
|
return vio_register_driver(&pseries_rng_driver);
|
|
}
|
|
|
|
module_init(rng_init);
|
|
|
|
static void __exit rng_exit(void)
|
|
{
|
|
vio_unregister_driver(&pseries_rng_driver);
|
|
}
|
|
module_exit(rng_exit);
|
|
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_AUTHOR("Michael Neuling <mikey@neuling.org>");
|
|
MODULE_DESCRIPTION("H/W RNG driver for IBM pSeries processors");
|