From patchwork Fri Oct 14 02:05:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaobo Liu X-Patchwork-Id: 2464 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp578955wrs; Thu, 13 Oct 2022 19:25:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5I2jLYci6rNvUdtjSLOPG/v38TTjiC1paBSEO3kotYe7mzo3Ltdxju1yODw6BLNVJubMNX X-Received: by 2002:a17:906:974c:b0:784:d96c:b4fa with SMTP id o12-20020a170906974c00b00784d96cb4famr1844159ejy.391.1665714330141; Thu, 13 Oct 2022 19:25:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665714330; cv=none; d=google.com; s=arc-20160816; b=W5jRA3sXLahMMCVYQ01Aa/OLj1WErCE7qqGazVGqZssrzD3kc9gqCwZY4BnOHQ5tat ikWEy84xhl5eFGZLtjYnN7KVBwaUFfjnko1qXwFRLplk4hqOJk9havZ0XC8EVe1Lkm0d 7xRdLVQn9mIGXubqSVeCp5parTErPG6CPQYspIxTEIluffFoTzMUTpm3q64SbJR1QUVs Bzx8zGbG4StYMuy0CPm3vy1WVyZ5uPCjOR2/ZwQF4XahXKa1pIAo5S6fw2o8wV8bLa1T tlZQlnkiwXfLLZWyuyy3rDo2JpZBUC6KldbH01wuF8nkpQP/zbymFl1OjOXt5G4A3luA 8Cwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=c8322atv62tEbkL85+mZmId4t2HkHpXWBmOWIZmHHKQ=; b=sk9sc4KEp3zK5HuT8dOXouOLzcXl5WqZTJHNBn3iM93Ioy3EkkqENa89x5rQarVFKw nbsm4MHlzzPKF5UhCkcksYuSmjn5bhONl9b2WY9SiIsDif5ZbHM+PhIDelRW6OKIdE/a MXe4aeWFN8C1dS6FPmvbM9bLI/+V1X/Gs15UJ4UFYFJYgXiD8GScq8Q23VTLSzid+XsQ B/io8DrKvdAi5s4XXDAq3q5T0hjYLNKivjHeC4V4B1swrZtQxHOFo2I4d+UpNZYGlwDZ VD137penTZGrvNRmvjp0ey+cZtk/EgwUUca76ADIL2jmLHZd31OfaG0WyauRL7eJOUg0 b78g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Cc7JU9HX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f17-20020a0564021e9100b00456e33b69e1si1559970edf.347.2022.10.13.19.25.04; Thu, 13 Oct 2022 19:25:30 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Cc7JU9HX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229747AbiJNCGA (ORCPT + 99 others); Thu, 13 Oct 2022 22:06:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229744AbiJNCFz (ORCPT ); Thu, 13 Oct 2022 22:05:55 -0400 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E83118C411; Thu, 13 Oct 2022 19:05:52 -0700 (PDT) Received: by mail-pj1-x1032.google.com with SMTP id a6-20020a17090abe0600b0020d7c0c6650so6620015pjs.0; Thu, 13 Oct 2022 19:05:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=c8322atv62tEbkL85+mZmId4t2HkHpXWBmOWIZmHHKQ=; b=Cc7JU9HXA+772G/+ua4nvw3QiVXgSueeEMfZ6iovpja8xdMGbEGPbrkZolZ/MRFcPb Aasi8lDuwKwZS41+zerWUkzANCnzobhfGdtaCJO+bdGqCRbpJ9nL5vvUJYgYE3R2vnbg T7R8ZQ/jyQPT04iI9g5SOcIMU9m32RcHEdbNoF/jTyG1zgWPECvox9R8X6K7X/4nxCnA EKOzpZlRoHVJSoiP65R4YYSPfdu8jbjEmgZ4w4s83wCGQNh9ggbNUpKLrxOMESobhOO5 XQjK9dkb+kirTXcYL98LWMsodpksl5QiKmB+Mdj6YUv3UJsnS1gBy6PEuYubkacoONI8 BoWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=c8322atv62tEbkL85+mZmId4t2HkHpXWBmOWIZmHHKQ=; b=cjMlSjCd8VMhOv3w9B8GjIbDEXDJJUIOCMYQSEO4ExHkbE7H/sveyJpjjD4NDRIW6c sfL2+LYt1fVGkMg4o01flBSsX+8iDyrJyWsE41TSGeYJCti5gO/Vb/LEQrW3w//RbgT1 6wxqRv8TDEQk6a9j0CsLEFgHzVw+R1BWOxiFuyCaEJqGekxk1SamDVkP/KiXyu3YSVT/ JTBheVcv34GpBNtUifoI0vEP4f0JAalIJZFaUL3wVpI/vxHDHkvEfneZQf/8Zg2uKL4a EC7zK7InsosDVCPIGYNHSe8yV5KQFzsK/HcqJcSOtLRkj1iMQBxKTCelfx1zpeXPkejJ evZA== X-Gm-Message-State: ACrzQf17BPOH13pNN8U83qmAG0hshEXNDTmDUNChcrkdkmc4UBVBXuYa t8s31T16pGocSua9kD0zWpM= X-Received: by 2002:a17:902:da91:b0:181:a0e6:5116 with SMTP id j17-20020a170902da9100b00181a0e65116mr2908309plx.57.1665713151092; Thu, 13 Oct 2022 19:05:51 -0700 (PDT) Received: from localhost.localdomain ([43.128.11.181]) by smtp.gmail.com with ESMTPSA id y24-20020aa79438000000b0056281da3bcbsm368804pfo.149.2022.10.13.19.05.47 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Oct 2022 19:05:50 -0700 (PDT) From: Xiaobo Liu To: davem@davemloft.net Cc: edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Xiaobo Liu Subject: [PATCH] net/atm: fix proc_mpc_write incorrect return value Date: Fri, 14 Oct 2022 10:05:40 +0800 Message-Id: <20221014020540.32114-1-cppcoffee@gmail.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122.2) MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746628069452865871?= X-GMAIL-MSGID: =?utf-8?q?1746628069452865871?= Then the input contains '\0' or '\n', proc_mpc_write has read them, so the return value needs +1. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Xiaobo Liu --- net/atm/mpoa_proc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/atm/mpoa_proc.c b/net/atm/mpoa_proc.c index 829db9eba..aaf64b953 100755 --- a/net/atm/mpoa_proc.c +++ b/net/atm/mpoa_proc.c @@ -219,11 +219,12 @@ static ssize_t proc_mpc_write(struct file *file, const char __user *buff, if (!page) return -ENOMEM; - for (p = page, len = 0; len < nbytes; p++, len++) { + for (p = page, len = 0; len < nbytes; p++) { if (get_user(*p, buff++)) { free_page((unsigned long)page); return -EFAULT; } + len += 1; if (*p == '\0' || *p == '\n') break; }