Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af15987a authored by Shuah Khan's avatar Shuah Khan Committed by Greg Kroah-Hartman
Browse files

usbip: fix vhci_hcd to check for stream socket



commit f55a0571690c4aae03180e001522538c0927432f upstream.

Fix attach_store() to validate the passed in file descriptor is a
stream socket. If the file descriptor passed was a SOCK_DGRAM socket,
sock_recvmsg() can't detect end of stream.

Cc: stable@vger.kernel.org
Suggested-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
Link: https://lore.kernel.org/r/52712aa308915bda02cece1589e04ee8b401d1f3.1615171203.git.skhan@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6162d497
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -309,8 +309,16 @@ static ssize_t store_attach(struct device *dev, struct device_attribute *attr,

	/* Extract socket from fd. */
	socket = sockfd_lookup(sockfd, &err);
	if (!socket)
	if (!socket) {
		dev_err(dev, "failed to lookup sock");
		return -EINVAL;
	}
	if (socket->type != SOCK_STREAM) {
		dev_err(dev, "Expecting SOCK_STREAM - found %d",
			socket->type);
		sockfd_put(socket);
		return -EINVAL;
	}

	/* now need lock until setting vdev status as used */