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

Commit 76eb600b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: Fix for wrong length in copy_to_user"

parents f7346920 9ec9f23a

drivers/video/msm/mdss/mdss_debug_xlog.c

+6 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2016, 2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -683,6 +683,11 @@ static ssize_t mdss_xlog_dump_read(struct file *file, char __user *buff, 


	if (__mdss_xlog_dump_calc_range()) {

		len = mdss_xlog_dump_entry(xlog_buf, MDSS_XLOG_BUF_MAX);

		if (len < 0 || len > count) {

			pr_err("len is more than the size of user buffer\n");

			return 0;

		}



		if (copy_to_user(buff, xlog_buf, len))

			return -EFAULT;

		*ppos += len;

drivers/video/msm/mdss/mdss_dsi.c

+1 −1
Original line number Diff line number Diff line
@@ -745,7 +745,7 @@ static ssize_t mdss_dsi_cmd_state_read(struct file *file, char __user *buf, 
	if (blen < 0)

		return 0;



	if (copy_to_user(buf, buffer, blen))

	if (copy_to_user(buf, buffer, min(count, (size_t)blen+1)))

		return -EFAULT;



	*ppos += blen;