Return a proper error code instead of panicing when an I/O vector

having the wrong number of entries is detected.

MFC after:	1 week
Sponsored by:	Mellanox Technologies
This commit is contained in:
Hans Petter Selasky 2016-05-11 10:50:59 +00:00
parent fd42d62378
commit b3c89b5ad9
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=299428

View File

@ -487,9 +487,9 @@ linux_dev_read(struct cdev *dev, struct uio *uio, int ioflag)
if ((error = devfs_get_cdevpriv((void **)&filp)) != 0)
return (error);
filp->f_flags = file->f_flag;
/* XXX no support for I/O vectors currently */
if (uio->uio_iovcnt != 1)
panic("linux_dev_read: uio %p iovcnt %d",
uio, uio->uio_iovcnt);
return (EOPNOTSUPP);
if (filp->f_op->read) {
bytes = filp->f_op->read(filp, uio->uio_iov->iov_base,
uio->uio_iov->iov_len, &uio->uio_offset);
@ -522,9 +522,9 @@ linux_dev_write(struct cdev *dev, struct uio *uio, int ioflag)
if ((error = devfs_get_cdevpriv((void **)&filp)) != 0)
return (error);
filp->f_flags = file->f_flag;
/* XXX no support for I/O vectors currently */
if (uio->uio_iovcnt != 1)
panic("linux_dev_write: uio %p iovcnt %d",
uio, uio->uio_iovcnt);
return (EOPNOTSUPP);
if (filp->f_op->write) {
bytes = filp->f_op->write(filp, uio->uio_iov->iov_base,
uio->uio_iov->iov_len, &uio->uio_offset);
@ -638,9 +638,9 @@ linux_file_read(struct file *file, struct uio *uio, struct ucred *active_cred,
error = 0;
filp = (struct linux_file *)file->f_data;
filp->f_flags = file->f_flag;
/* XXX no support for I/O vectors currently */
if (uio->uio_iovcnt != 1)
panic("linux_file_read: uio %p iovcnt %d",
uio, uio->uio_iovcnt);
return (EOPNOTSUPP);
if (filp->f_op->read) {
bytes = filp->f_op->read(filp, uio->uio_iov->iov_base,
uio->uio_iov->iov_len, &uio->uio_offset);