Merge cherrypicks of ['googleplex-android-review.googlesource.com/28645058'] into sparse-12210230-L62100030005810919.
SPARSE_CHANGE: Ie4c8a87b2b3fa7fa50047ef143a8cdd84186e5cc

Change-Id: Ic0ca11b601d07ecdffb67928edd64b980934696d

lib/portability.c

diff --git a/lib/portability.c b/lib/portability.c
index abcecc8..b541c5d 100644
--- a/lib/portability.c
+++ b/lib/portability.c
@@ -658,7 +658,7 @@
 
     errno = 0;
     if (try_cfr) {
-      if (bytes<0 || bytes>(1<<30)) len = (1<<30);
+      if (bytes<0 || len>(1<<30)) len = (1<<30);
       len = syscall(try_cfr, in, 0, out, 0, len, 0);
       if (len < 0) {
         try_cfr = 0;