On Monday 11 April 2011, John Calixto wrote:
> Sending ACMDs from userspace is useful for such things as:
> 
>     - The security application of an SD card (SD Specification, Part 3,
>       Security)
> 
>     - SD passthrough for virtual machines
> 
> Tested on TI PCIxx12 (SDHCI), Sigma Designs SMP8652 SoC, TI OMAP3621
> SoC, TI OMAP3630 SoC, Samsung S5PC110 SoC, Qualcomm MSM7200A SoC.
> 
> Signed-off-by: John Calixto <john.cali...@modsystems.com>
> Reviewed-by: Andrei Warkentin <andr...@motorola.com>

Since the code is limited to ACMD and cannot do arbitrary commands, it's 
actually
not possible to use this for the passthrough scenario, so you should not mention
it in the changelog.

I would also still advocate something more high-level here because it's limited
to a single use case. If you make the ioctl interface do the security commands
directly, you would not need to rely on CAP_SYS_RAWIO.

> +static struct mmc_blk_ioc_data *mmc_blk_ioctl_copy_from_user(
> +     struct mmc_ioc_cmd __user *user)
> +{
> +     struct mmc_blk_ioc_data *idata;
> +     int err;
> +
> +     idata = kzalloc(sizeof(*idata), GFP_KERNEL);
> +     if (!idata) {
> +             err = -ENOMEM;
> +             goto copy_err;
> +     }
> +
> +     if (copy_from_user(&idata->ic, user, sizeof(idata->ic))) {
> +             err = -EFAULT;
> +             goto copy_err;
> +     }
> +
> +     idata->buf_bytes = idata->ic.blksz * idata->ic.blocks;
> +
> +     idata->buf = kzalloc(idata->buf_bytes, GFP_KERNEL);

You should probably check the size and allow a fixed maximum here.

> +static int mmc_blk_ioctl(struct block_device *bdev, fmode_t mode,
> +     unsigned int cmd, unsigned long arg)
> +{
> +     int ret = -EINVAL;
> +     mutex_lock(&block_mutex);
> +     if (cmd == MMC_IOC_ACMD)
> +             ret = mmc_blk_ioctl_acmd(bdev, (struct mmc_ioc_cmd __user 
> *)arg);
> +     mutex_unlock(&block_mutex);
> +     return ret;
> +}

Why do you need the mutex here?

> +#ifdef CONFIG_COMPAT
> +static int mmc_blk_compat_ioctl(struct block_device *bdev, fmode_t mode,
> +     unsigned int cmd, unsigned long arg)
> +{
> +     struct mmc_ioc_cmd __user *ic = (struct mmc_ioc_cmd __user *) arg;
> +     ic->data_ptr = ic->data_ptr & 0xffffffff;

This conversion should use

        ptr = (unsigned long)compat_ptr(ptr32);

You must never access __user pointers with a direct pointer dereference, but 
have
to use copy_{from,to}_user or {get,put}_user. The code you have here allows a
fairly simple root exploit.

        Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to