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

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

Merge "mdss: mdp: fix rotator compat layer copy"

parents b9871629 b1502682

drivers/video/msm/mdss/mdss_rotator.c

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

/* Copyright (c) 2014-2016, 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
@@ -2318,7 +2318,7 @@ static int mdss_rotator_handle_request32(struct mdss_rot_mgr *mgr, 
		pr_err("fail to allocate rotation items\n");

		return -ENOMEM;

	}

	ret = copy_from_user(items, user_req32.list, size);

	ret = copy_from_user(items, compat_ptr(user_req32.list), size);

	if (ret) {

		pr_err("fail to copy rotation items\n");

		goto handle_request32_err;
@@ -2345,7 +2345,7 @@ static int mdss_rotator_handle_request32(struct mdss_rot_mgr *mgr, 
		goto handle_request32_err1;

	}



	ret = copy_to_user(user_req32.list, items, size);

	ret = copy_to_user(compat_ptr(user_req32.list), items, size);

	if (ret) {

		pr_err("fail to copy output fence to user\n");

		mdss_rotator_remove_request(mgr, private, req);

drivers/video/msm/mdss/mdss_rotator_internal.h

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

/* Copyright (c) 2014-2016, 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
@@ -191,7 +191,7 @@ struct mdp_rotation_request32 { 
	uint32_t version;

	uint32_t flags;

	uint32_t count;

	compat_caddr_t __user *list;

	compat_caddr_t list;

	uint32_t reserved[6];

};

#endif