]> git.karo-electronics.de Git - karo-tx-linux.git/commit
af_unix: Don't set err in unix_stream_read_generic unless there was an error
authorRainer Weikusat <rweikusat@mobileactivedefense.com>
Mon, 8 Feb 2016 18:47:19 +0000 (18:47 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 3 Mar 2016 23:07:06 +0000 (15:07 -0800)
commit2f46f069ccfb28e6fdaa6798544fd30b72835b04
tree73bbe7fde065df51cf696d41a2458be0260b6eb1
parent6b567a1abd72a4deb95126f164afcf62a3e091a1
af_unix: Don't set err in unix_stream_read_generic unless there was an error

[ Upstream commit 1b92ee3d03af6643df395300ba7748f19ecdb0c5 ]

The present unix_stream_read_generic contains various code sequences of
the form

err = -EDISASTER;
if (<test>)
goto out;

This has the unfortunate side effect of possibly causing the error code
to bleed through to the final

out:
return copied ? : err;

and then to be wrongly returned if no data was copied because the caller
didn't supply a data buffer, as demonstrated by the program available at

http://pad.lv/1540731

Change it such that err is only set if an error condition was detected.

Fixes: 3822b5c2fc62 ("af_unix: Revert 'lock_interruptible' in stream receive code")
Reported-by: Joseph Salisbury <joseph.salisbury@canonical.com>
Signed-off-by: Rainer Weikusat <rweikusat@mobileactivedefense.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/unix/af_unix.c