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

Commit 6fb392b1 authored by Ursula Braun's avatar Ursula Braun Committed by David S. Miller
Browse files

qeth: avoid buffer overflow in snmp ioctl 



Check user-defined length in snmp ioctl request and allow request
only if it fits into a qeth command buffer.

Signed-off-by: default avatarUrsula Braun <ursula.braun@de.ibm.com>
Signed-off-by: default avatarFrank Blaschka <frank.blaschka@de.ibm.com>
Reviewed-by: default avatarHeiko Carstens <heicars2@linux.vnet.ibm.com>
Reported-by: default avatarNico Golde <nico@ngolde.de>
Reported-by: default avatarFabian Yamaguchi <fabs@goesec.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 17102f8b

drivers/s390/net/qeth_core_main.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -4451,7 +4451,7 @@ int qeth_snmp_command(struct qeth_card *card, char __user *udata) 
	struct qeth_cmd_buffer *iob;

	struct qeth_cmd_buffer *iob;

	struct qeth_ipa_cmd *cmd;

	struct qeth_ipa_cmd *cmd;

	struct qeth_snmp_ureq *ureq;

	struct qeth_snmp_ureq *ureq;

	int req_len;

	unsigned int req_len;

	struct qeth_arp_query_info qinfo = {0, };

	struct qeth_arp_query_info qinfo = {0, };

	int rc = 0;

	int rc = 0;
@@ -4467,6 +4467,10 @@ int qeth_snmp_command(struct qeth_card *card, char __user *udata) 
	/* skip 4 bytes (data_len struct member) to get req_len */

	/* skip 4 bytes (data_len struct member) to get req_len */

	if (copy_from_user(&req_len, udata + sizeof(int), sizeof(int)))

	if (copy_from_user(&req_len, udata + sizeof(int), sizeof(int)))

		return -EFAULT;

		return -EFAULT;

	if (req_len > (QETH_BUFSIZE - IPA_PDU_HEADER_SIZE -

		       sizeof(struct qeth_ipacmd_hdr) -

		       sizeof(struct qeth_ipacmd_setadpparms_hdr)))

		return -EINVAL;

	ureq = memdup_user(udata, req_len + sizeof(struct qeth_snmp_ureq_hdr));

	ureq = memdup_user(udata, req_len + sizeof(struct qeth_snmp_ureq_hdr));

	if (IS_ERR(ureq)) {

	if (IS_ERR(ureq)) {

		QETH_CARD_TEXT(card, 2, "snmpnome");

		QETH_CARD_TEXT(card, 2, "snmpnome");