From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:52676 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934475AbcIVPlw (ORCPT ); Thu, 22 Sep 2016 11:41:52 -0400 Subject: Patch "blackfin: fix copy_from_user()" has been added to the 4.4-stable tree To: viro@zeniv.linux.org.uk, gregkh@linuxfoundation.org Cc: , From: Date: Thu, 22 Sep 2016 17:41:43 +0200 Message-ID: <14745589032560@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled blackfin: fix copy_from_user() to the 4.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: blackfin-fix-copy_from_user.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 8f035983dd826d7e04f67b28acf8e2f08c347e41 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 9 Sep 2016 19:16:58 -0400 Subject: blackfin: fix copy_from_user() From: Al Viro commit 8f035983dd826d7e04f67b28acf8e2f08c347e41 upstream. Signed-off-by: Al Viro Signed-off-by: Greg Kroah-Hartman --- arch/blackfin/include/asm/uaccess.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) --- a/arch/blackfin/include/asm/uaccess.h +++ b/arch/blackfin/include/asm/uaccess.h @@ -177,11 +177,12 @@ static inline int bad_user_access_length static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) { - if (access_ok(VERIFY_READ, from, n)) + if (likely(access_ok(VERIFY_READ, from, n))) { memcpy(to, (const void __force *)from, n); - else - return n; - return 0; + return 0; + } + memset(to, 0, n); + return n; } static inline unsigned long __must_check Patches currently in stable-queue which might be from viro@zeniv.linux.org.uk are queue-4.4/nios2-copy_from_user-should-zero-the-tail-of-destination.patch queue-4.4/m32r-fix-__get_user.patch queue-4.4/microblaze-fix-copy_from_user.patch queue-4.4/cris-buggered-copy_from_user-copy_to_user-clear_user.patch queue-4.4/asm-generic-make-copy_from_user-zero-the-destination-properly.patch queue-4.4/metag-copy_from_user-should-zero-the-destination-on-access_ok-failure.patch queue-4.4/score-fix-__get_user-get_user.patch queue-4.4/parisc-fix-copy_from_user.patch queue-4.4/mips-copy_from_user-must-zero-the-destination-on-access_ok-failure.patch queue-4.4/alpha-fix-copy_from_user.patch queue-4.4/mn10300-failing-__get_user-and-get_user-should-zero.patch queue-4.4/openrisc-fix-copy_from_user.patch queue-4.4/avr32-fix-copy_from_user.patch queue-4.4/score-fix-copy_from_user-and-friends.patch queue-4.4/sh64-failing-__get_user-should-zero.patch queue-4.4/arc-uaccess-get_user-to-zero-out-dest-in-cause-of-fault.patch queue-4.4/hexagon-fix-strncpy_from_user-error-return.patch queue-4.4/frv-fix-clear_user.patch queue-4.4/fix-minor-infoleak-in-get_user_ex.patch queue-4.4/asm-generic-make-get_user-clear-the-destination-on-errors.patch queue-4.4/mn10300-copy_from_user-should-zero-on-access_ok-failure.patch queue-4.4/s390-get_user-should-zero-on-failure.patch queue-4.4/microblaze-fix-__get_user.patch queue-4.4/blackfin-fix-copy_from_user.patch queue-4.4/fix-iov_iter_fault_in_readable.patch queue-4.4/nios2-fix-__get_user.patch queue-4.4/sh-fix-copy_from_user.patch