Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 8 Sep 2022 15:20:23 +0300
From:   Dan Carpenter <dan.carpenter@oracle.com>
To:     Alexander Viro <viro@zeniv.linux.org.uk>,
        Jakub Kicinski <kuba@kernel.org>
Cc:     "David S. Miller" <davem@davemloft.net>,
        linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
        kernel-janitors@vger.kernel.org
Subject: [PATCH net-next] iov_iter: use "maxpages" parameter
Message-ID: <YxneB8I8gydE+8MF@kili>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NlRp2KNQbGfpUk/ZFLLCDeh1OZ9l0eCyMiwQod64Ie5W7xRjfs+BFfub9Kj7?=
 =?us-ascii?Q?hhUk5XlIny10D9eN/7WKWXW0+E+sUy0l9B84hjrdCF8BjpqqPRmyTdOU4Vfc?=
 =?us-ascii?Q?Role/IRzFNec2hs2tMmPO2Srghl+9dC+LGdOjsCrD/LNb+1IT9nT/tLVD6AH?=
 =?us-ascii?Q?ZU618VvyQ9Ub9reNS6qFbTBrA7psaJL2FnSAXpk0ZORs0d4NddBlSw3Wib/I?=
 =?us-ascii?Q?kD/62eISqriNN7Ygu1+7gcASbElPgNcmvrLK8JodaNb1+buzKVkKtvUQvQ0k?=
 =?us-ascii?Q?OszwJl4V9WX58jv8vCrWJHzzGp4EIkma/TZ2eyi8dKx1HSHS2CUr26RLk7wa?=
 =?us-ascii?Q?G6iM6Ohu9WsmIYS7+G3QIgwk6WR2HzYXiIYAh96EEXMnqHedhw4BFiVgDNhp?=
 =?us-ascii?Q?RCGzW7sD8Z9/CSfypsBMLRQXn5c+cuOP4/+nj/AuAEAlVArls9lNGFYrkjj8?=
 =?us-ascii?Q?7eZ18Kxrn0bHpn/NsCrCYf5QXViQZywHDkEvPSoo0DePOPxEEU76zowMpL+d?=
 =?us-ascii?Q?uCn7zXpHIpe+T4efbNU2NDHBl4zKMCOGPWjVTp+sPfe1Mi6wp3YuZtf8D7nl?=
 =?us-ascii?Q?XZrf9p/3n/HuarmEcxqEyjHVfaIhrWvpOlBCnyuTznmA6JxNa0t35/dDDhuW?=
 =?us-ascii?Q?ay4s0C1BdAXKxbMOQgBvZeX60chEcENlRc67uBiH8wkxt4K+gvt2Xv9qwOaK?=
 =?us-ascii?Q?1qeSySoQ5koxmxDIDOCi0SRwn9ZMu75V8tZ9SpTUaup/ulOR+XJau8dImaK0?=
 =?us-ascii?Q?8Dza8UUeVKTymIjBBComO1DL/RjNimvVRLlqPu8L3q6K+2EqjMrBSmTKzyjA?=
 =?us-ascii?Q?jE9naMdpGb99pKqTGeuEHGiCpa6vC6BlokpAKfXHu8/u9UmBE3KtRuNBpzKZ?=
 =?us-ascii?Q?aPDb+rB9Vl/FBMBgPJ6T52Erlsk8ZRObsbIDqfQJJzft8SFsk4wolt7antEm?=
 =?us-ascii?Q?05mS576BUMCBmx6pwSfHTZdvhi9sF+c1uqqkMyQ8Ru0Ggs8I5DuQoCr5Osl6?=
 =?us-ascii?Q?2uiSCSilyDqUtquXMUiABg1uIv44mbEhQ43HST4kvEeNb9dqeoA+34DVuB1m?=
 =?us-ascii?Q?YhkrFukNRyZaQoPZKEAcHv+N3/Anc/4vaOZldVliMsqqP9WzYdQZSppSnyLL?=
 =?us-ascii?Q?oK4JeYzqv0c6O5yP8KiVbwgDIr9myYmGoFgNG7gkZBjmZp/h42stTmqA+6f/?=
 =?us-ascii?Q?zmyt+Kt2zUMv5fwjkOPbtmVyMVgriTx9Uxqm88K0vpj2yIyGLTH9DvyI4TrQ?=
 =?us-ascii?Q?rml+0ICoefpkFe5178UdqrXrMHzWchXy5xQyTMmWoOFQJrTnuXHKOvBHZvbD?=
 =?us-ascii?Q?RE6eigJM8ZqnfglGr7Vi2HiEHvy71O+mKVZmdv9eNMryacbmNkINHokcEX/N?=
 =?us-ascii?Q?CrkUjzYSbfnllGpsDiv+juBO+kTecmQLkUerFiyg2zz1+qJeFcRqxBMg2Mjv?=
 =?us-ascii?Q?qAJprl8L5McjK3r+pA9/LtOkMkE3VkGDi8A/Od+2LPaoNnIvxcBbfSGwGKUo?=
 =?us-ascii?Q?ordiLxi5gE0u/0aHrT4cVFSPAFSyfDzZbwfQHy1ygA6Ff2fZeD8z6HelOyk2?=
 =?us-ascii?Q?9wrIvtX0lAJRxxN+Vq03kCGBVeuZB6hjbCaINFN3wktxT4LdyGDFNGu6gHpm?=
 =?us-ascii?Q?vQ=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fd38fdfb-e60f-483d-d109-08da919484b7
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2365.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2022 12:20:29.5735
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 1Ovx+R0dTEbviJQP/9siTeC9TxhdwZ5u3Htsd9snEnL3VGdqdYcUTHbAoAM1XszgvH5fAMqwlbKZB4wX8D7oKCL/KLuwiVYXY4q1fv0C+GI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR10MB5824
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1
 definitions=2022-09-08_08,2022-09-07_02,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 adultscore=0 malwarescore=0
 mlxscore=0 phishscore=0 mlxlogscore=999 suspectscore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000
 definitions=main-2209080045
X-Proofpoint-GUID: d4qY-PCylBu9dObKGgPRifOEhtVHWpw-
X-Proofpoint-ORIG-GUID: d4qY-PCylBu9dObKGgPRifOEhtVHWpw-
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This was intended to be "maxpages" instead of INT_MAX.  There is only
one caller and it passes INT_MAX so this does not affect runtime.

Fixes: b93235e68921 ("tls: cap the output scatter list to something reasonable")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
I'm not sure which tree this should go through.  It's a cleanup and the
only caller is in networking so probably net-next is easiest.

 include/linux/uio.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/uio.h b/include/linux/uio.h
index e26908e443d1..47aec904a3eb 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -302,7 +302,7 @@ iov_iter_npages_cap(struct iov_iter *i, int maxpages, size_t max_bytes)
 		shorted = iov_iter_count(i) - max_bytes;
 		iov_iter_truncate(i, max_bytes);
 	}
-	npages = iov_iter_npages(i, INT_MAX);
+	npages = iov_iter_npages(i, maxpages);
 	if (shorted)
 		iov_iter_reexpand(i, iov_iter_count(i) + shorted);
 
-- 
2.35.1