Path: csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!bofh.it!news.nic.it!robomod From: Peter Hurley Newsgroups: linux.kernel Subject: [PATCH] n_tty: Clarify copy_from_read_buf() Date: Sun, 08 Nov 2015 15:40:01 +0100 Message-ID: X-Original-To: Greg Kroah-Hartman 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; bh=AzCU0A885mCw9U20KvHF9IOGuMjLoQu0URuLOsvIMsc=; b=ZT+GMXiHJjLgx1l9mMO6rxhA/vQovPeptJZy9M5zn238c4GspIKAIUD7yY3vk+TVUm U+k+ACUZlSojZaM2Mg37QlrblGQ39Roapf662UyrV1scq7FRmEb9wUY7Q3hrtSAyJY12 yPs8CcHaP9s9zSfs6lGko5yoXcSGKkgqD5lABGbGRoMgbtc9YS0dbC3as2AcqnE/mMJd txBZPCG9U3rZ+UKpS1tU12K2OqJePwbSpJmF9xYP0MNcjEKTYkiIbC8tg6+ynLpVJGJE NhXROoSPx6myIR6XATuzYbe0/ezJ0xwApIIKll2VFifM18apujC5KkcaqWW94rbcx6GS cHdg== 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; bh=AzCU0A885mCw9U20KvHF9IOGuMjLoQu0URuLOsvIMsc=; b=YOmZE09GE29lVRNj4BOMO+ImZhbjTZ9GLdQwis2BQlSxBH9pqIgRpVdJN7jFdCqZQ3 Nf698Cj/5UTKv3Zdit7w8qv4s5mNM83Cr9w3PLvXwo7gvivuZyxhiSg6wBhRKl8T3Ljf aiYYsCrsxux2UV7Ns+o2y2NsGZW9mBlCbZLwUrfQsmQWJR+t9LwG2YFgPeVXN5zElNSk slpmkmynQ7fwGmMSjxE5Gb74jSdOy9UFaGx8MuTHEPa4ft30vkjh9gi21YqOfuuWnLxk 4sfTnvvxRl62U7EaTKoR0d1FA6UHY+6M7NmnOq/OO0ZJTTSW541ZaDKvYln/p6PXEXjj oCxA== X-Gm-Message-State: ALoCoQlJ1eUUTmQh6fYCcGRILpMwGzlR6SHjPB1Sj23VMyvuSn8f8oblUpiCxZNsp71w3ZSwD4bR X-Received: by 10.50.50.139 with SMTP id c11mr18216776igo.10.1446993315147; Sun, 08 Nov 2015 06:35:15 -0800 (PST) X-Mailer: git-send-email 2.6.3 Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 36 Organization: linux.* mail to news gateway X-Original-Cc: Jiri Slaby , linux-kernel@vger.kernel.org, Peter Hurley X-Original-Date: Sun, 8 Nov 2015 09:35:09 -0500 X-Original-Message-ID: <1446993310-7681-1-git-send-email-peter@hurleysoftware.com> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1265107 Add a temporary for the computed source address and substitute where appropriate. No functional change. Signed-off-by: Peter Hurley --- drivers/tty/n_tty.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c index b2b01d5..bc613b8 100644 --- a/drivers/tty/n_tty.c +++ b/drivers/tty/n_tty.c @@ -2014,11 +2014,11 @@ static int copy_from_read_buf(struct tty_struct *tty, n = min(head - ldata->read_tail, N_TTY_BUF_SIZE - tail); n = min(*nr, n); if (n) { - retval = copy_to_user(*b, read_buf_addr(ldata, tail), n); + const unsigned char *from = read_buf_addr(ldata, tail); + retval = copy_to_user(*b, from, n); n -= retval; - is_eof = n == 1 && read_buf(ldata, tail) == EOF_CHAR(tty); - tty_audit_add_data(tty, read_buf_addr(ldata, tail), n, - ldata->icanon); + is_eof = n == 1 && *from == EOF_CHAR(tty); + tty_audit_add_data(tty, from, n, ldata->icanon); smp_store_release(&ldata->read_tail, ldata->read_tail + n); /* Turn single EOF into zero-length read */ if (L_EXTPROC(tty) && ldata->icanon && is_eof && -- 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/