Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: ebBvlPJaLlcsdlK9ei/sHdl0Sw4hCftLzwzYPLnG9cfvYlmqHdf6LrShJUrbua5Vjnezmb0Q7a
 jw5p+94HLlwjFTquVMZ7kVsuulnvtd1mY36BNGvolY/wIINiwciKjKNPuODhcYiuuR4cIZRNvV
 bWuTCkfX3GULveSubKUfM4Ac0/NDjj0K8jzmZh3uxNShpaNQ8aP8GR8vPxNFvouRqHupeNYqNp
 cjgoiJh+cuVPTuHjEQELQD5y0wvqT+5MEozCrcNZ8cbYQT157KC4+/vWo2IKtkM3yID5LyXrOo
 KMM=
From:   Damien Le Moal <Damien.LeMoal@wdc.com>
To:     Christoph Hellwig <hch@lst.de>, Jens Axboe <axboe@kernel.dk>
CC:     Tim Waugh <tim@cyberelk.net>, Borislav Petkov <bp@alien8.de>,
        Jan Kara <jack@suse.com>,
        "linux-block@vger.kernel.org" <linux-block@vger.kernel.org>,
        "linux-ide@vger.kernel.org" <linux-ide@vger.kernel.org>,
        "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
        "linux-fsdevel@vger.kernel.org" <linux-fsdevel@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 3/7] cdrom: factor out a cdrom_read_tocentry helper
Thread-Topic: [PATCH 3/7] cdrom: factor out a cdrom_read_tocentry helper
Thread-Index: AQHWGT77oq3lF2gDFEqy0zN3qm+k1A==
Date:   Thu, 23 Apr 2020 07:41:18 +0000
Message-ID: <BY5PR04MB6900ABB062D1941B97EA8F3EE7D30@BY5PR04MB6900.namprd04.prod.outlook.com>
References: <20200423071224.500849-1-hch@lst.de>
 <20200423071224.500849-4-hch@lst.de>
Accept-Language: en-US
Content-Language: en-US
wdcipoutbound: EOP-TRUE
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: fb2bb0a2-045e-4afb-a4a7-08d7e759b5f0
X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Apr 2020 07:41:18.5064
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: ebzzItZs6cvcHSZUMUvEMwbdSz6k9dOk7UcZ4/wMK3UG/I0cBL3Y2qrjSChUcO2CVGvqdFYYg4d2M/5W/FON7A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR04MB7076
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 2020/04/23 16:15, Christoph Hellwig wrote:=0A=
> Factor out a version of the CDROMREADTOCENTRY ioctl handler that can=0A=
> be called directly from kernel space.=0A=
> =0A=
> Signed-off-by: Christoph Hellwig <hch@lst.de>=0A=
> ---=0A=
>  drivers/cdrom/cdrom.c | 39 ++++++++++++++++++++++-----------------=0A=
>  include/linux/cdrom.h |  3 +++=0A=
>  2 files changed, 25 insertions(+), 17 deletions(-)=0A=
> =0A=
> diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c=0A=
> index a1d2112fd283..c91d1e138214 100644=0A=
> --- a/drivers/cdrom/cdrom.c=0A=
> +++ b/drivers/cdrom/cdrom.c=0A=
> @@ -2666,32 +2666,37 @@ static int cdrom_ioctl_read_tochdr(struct cdrom_d=
evice_info *cdi,=0A=
>  	return 0;=0A=
>  }=0A=
>  =0A=
> +int cdrom_read_tocentry(struct cdrom_device_info *cdi,=0A=
> +		struct cdrom_tocentry *entry)=0A=
> +{=0A=
> +	u8 requested_format =3D entry->cdte_format;=0A=
> +	int ret;=0A=
> +=0A=
> +	if (requested_format !=3D CDROM_MSF && requested_format !=3D CDROM_LBA)=
=0A=
> +		return -EINVAL;=0A=
> +=0A=
> +	/* make interface to low-level uniform */=0A=
> +	entry->cdte_format =3D CDROM_MSF;=0A=
> +	ret =3D cdi->ops->audio_ioctl(cdi, CDROMREADTOCENTRY, entry);=0A=
> +	if (!ret)=0A=
> +		sanitize_format(&entry->cdte_addr, &entry->cdte_format,=0A=
> +				requested_format);=0A=
> +	return ret;=0A=
> +}=0A=
> +EXPORT_SYMBOL_GPL(cdrom_read_tocentry);=0A=
> +=0A=
>  static int cdrom_ioctl_read_tocentry(struct cdrom_device_info *cdi,=0A=
>  		void __user *argp)=0A=
>  {=0A=
>  	struct cdrom_tocentry entry;=0A=
> -	u8 requested_format;=0A=
>  	int ret;=0A=
>  =0A=
> -	/* cd_dbg(CD_DO_IOCTL, "entering CDROMREADTOCENTRY\n"); */=0A=
> -=0A=
>  	if (copy_from_user(&entry, argp, sizeof(entry)))=0A=
>  		return -EFAULT;=0A=
> -=0A=
> -	requested_format =3D entry.cdte_format;=0A=
> -	if (requested_format !=3D CDROM_MSF && requested_format !=3D CDROM_LBA)=
=0A=
> -		return -EINVAL;=0A=
> -	/* make interface to low-level uniform */=0A=
> -	entry.cdte_format =3D CDROM_MSF;=0A=
> -	ret =3D cdi->ops->audio_ioctl(cdi, CDROMREADTOCENTRY, &entry);=0A=
> -	if (ret)=0A=
> -		return ret;=0A=
> -	sanitize_format(&entry.cdte_addr, &entry.cdte_format, requested_format)=
;=0A=
> -=0A=
> -	if (copy_to_user(argp, &entry, sizeof(entry)))=0A=
> +	ret =3D cdrom_read_tocentry(cdi, &entry);=0A=
> +	if (!ret && copy_to_user(argp, &entry, sizeof(entry)))=0A=
>  		return -EFAULT;=0A=
> -	/* cd_dbg(CD_DO_IOCTL, "CDROMREADTOCENTRY successful\n"); */=0A=
> -	return 0;=0A=
> +	return ret;=0A=
>  }=0A=
>  =0A=
>  static int cdrom_ioctl_play_msf(struct cdrom_device_info *cdi,=0A=
> diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h=0A=
> index 4f74ce050253..008c4d79fa33 100644=0A=
> --- a/include/linux/cdrom.h=0A=
> +++ b/include/linux/cdrom.h=0A=
> @@ -94,6 +94,9 @@ struct cdrom_device_ops {=0A=
>  			       struct packet_command *);=0A=
>  };=0A=
>  =0A=
> +int cdrom_read_tocentry(struct cdrom_device_info *cdi,=0A=
> +		struct cdrom_tocentry *entry);=0A=
> +=0A=
>  /* the general block_device operations structure: */=0A=
>  extern int cdrom_open(struct cdrom_device_info *cdi, struct block_device=
 *bdev,=0A=
>  			fmode_t mode);=0A=
> =0A=
=0A=
Looks OK to me.=0A=
=0A=
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>=0A=
=0A=
=0A=
-- =0A=
Damien Le Moal=0A=
Western Digital Research=0A=