[PATCH] n_tty: Uninline tty_copy_to_user()

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod
From	Peter Hurley <peter@hurleysoftware.com>
Newsgroups	linux.kernel
Subject	[PATCH] n_tty: Uninline tty_copy_to_user()
Date	Sun, 08 Nov 2015 15:40:01 +0100
Message-ID	<qszip-1jV-5@gated-at.bofh.it> (permalink)
References	<qszip-1jV-7@gated-at.bofh.it>
X-Original-To	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=hurleysoftware_com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XE+r3OV/nH5vHBO3277LLzGpLtmx3iW2sVHgMwrvgkk=; b=H+r5wA7UoA5CTUo6M03fc32VBdhn9V4+Ge49T87YqXbMQ4W2nlMhlNew9CmSfYeEFK ewv54TU5TzQASxxYAWDyyDj9V3/VWKOCNMgfk3AJwRggJuTVkA7jwqBtWDKW5rYApdI1 v1/MCdivZMwOCjD4mgySPk/+Sd2VyzUAwPWg4Rn0Z7Zax67iHwbmFOoQcNLVSfMDA7Tq I6dJDjOSFHDy9BkpV4KRuV9jy/wiSZQhkqarHh/KaFwhMb5Sevw0ac+ywSHViFuFWHoh hF625XEDq0BMnb5VIRv4ucMZC4nbUVFe7emQ1AaLQYfwOxX+Grwb2buEht+grc1TIyz7 0ctQ==
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XE+r3OV/nH5vHBO3277LLzGpLtmx3iW2sVHgMwrvgkk=; b=cLTPHLuT7ShLFFEoiSTGUa38ceKD0ZBrGUroPA6NIn0RWRP1X9Gt5oER6hCnyxXqao y0QoBNL+AigVnEKeY83JNe94kflof84i+RgN45WoKVXWTFjw1s6lIOa9hYJM8Wrmg9oR BbaDKSNS+KEOfw1fO3/hcYVaV6EU2RO2Njo+P8fzAMI7WnKITN9c+GQXT/qWDv4HPcSl CX2huL5fOuxhY0HpWb0hMCTH1ru6nGXSrMo7vMBrQDJGABKjeTEkhVkSp4tENgJlZQOH GBe4kES9jXrhI7dj2MDD5T0R0Rf7vGFabxAaMm+IY840rWUKXdZBSIiYK0cNPQNXg22V veCg==
X-Gm-Message-State	ALoCoQkeUJk7Bb5q3w/ZsxDKEygYAvf90Z7llnPE57pzM1mTBJcLfifzMENcfiSCJIkqssjKNKKk
X-Received	by 10.107.152.209 with SMTP id a200mr26927100ioe.44.1446993320670; Sun, 08 Nov 2015 06:35:20 -0800 (PST)
X-Mailer	git-send-email 2.6.3
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	80
Organization	linux.* mail to news gateway
X-Original-Cc	Jiri Slaby <jslaby@suse.cz>, linux-kernel@vger.kernel.org, Peter Hurley <peter@hurleysoftware.com>
X-Original-Date	Sun, 8 Nov 2015 09:35:10 -0500
X-Original-Message-ID	<1446993310-7681-2-git-send-email-peter@hurleysoftware.com>
X-Original-References	<1446993310-7681-1-git-send-email-peter@hurleysoftware.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1265106

Show key headers only | View raw

Merge the multiple tty_copy_to_user() calls into a single copy
sequence within tty_copy_to_user().

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---

Requires: "tty: audit: Fix audit source"

 drivers/tty/n_tty.c | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index c37c15d..b2b01d5 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -162,12 +162,23 @@ static inline int tty_put_user(struct tty_struct *tty, unsigned char x,
 	return put_user(x, ptr);
 }
 
-static inline int tty_copy_to_user(struct tty_struct *tty,
-					void __user *to,
-					const void *from,
-					unsigned long n)
+static int tty_copy_to_user(struct tty_struct *tty, void __user *to,
+			    size_t tail, size_t n)
 {
 	struct n_tty_data *ldata = tty->disc_data;
+	size_t size = N_TTY_BUF_SIZE - tail;
+	const void *from = read_buf_addr(ldata, tail);
+	int uncopied;
+
+	if (n > size) {
+		tty_audit_add_data(tty, from, size, ldata->icanon);
+		uncopied = copy_to_user(to, from, size);
+		if (uncopied)
+			return uncopied;
+		to += size;
+		n -= size;
+		from = ldata->read_buf;
+	}
 
 	tty_audit_add_data(tty, from, n, ldata->icanon);
 	return copy_to_user(to, from, n);
@@ -2074,7 +2085,6 @@ static int canon_copy_from_read_buf(struct tty_struct *tty,
 	} else if (eol != size)
 		found = 1;
 
-	size = N_TTY_BUF_SIZE - tail;
 	n = eol - tail;
 	if (n > N_TTY_BUF_SIZE)
 		n += N_TTY_BUF_SIZE;
@@ -2086,17 +2096,10 @@ static int canon_copy_from_read_buf(struct tty_struct *tty,
 		eof_push = !n && ldata->read_tail != ldata->line_start;
 	}
 
-	n_tty_trace("%s: eol:%zu found:%d n:%zu c:%zu size:%zu more:%zu\n",
-		    __func__, eol, found, n, c, size, more);
-
-	if (n > size) {
-		ret = tty_copy_to_user(tty, *b, read_buf_addr(ldata, tail), size);
-		if (ret)
-			return -EFAULT;
-		ret = tty_copy_to_user(tty, *b + size, ldata->read_buf, n - size);
-	} else
-		ret = tty_copy_to_user(tty, *b, read_buf_addr(ldata, tail), n);
+	n_tty_trace("%s: eol:%zu found:%d n:%zu c:%zu tail:%zu more:%zu\n",
+		    __func__, eol, found, n, c, tail, more);
 
+	ret = tty_copy_to_user(tty, *b, tail, n);
 	if (ret)
 		return -EFAULT;
 	*b += n;
-- 
2.6.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] n_tty: Uninline tty_copy_to_user() Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 15:40 +0100

csiph-web