From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2044FC43331 for ; Fri, 6 Sep 2019 06:13:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05474206BB for ; Fri, 6 Sep 2019 06:13:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="P1xzjDrA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389591AbfIFGNP (ORCPT ); Fri, 6 Sep 2019 02:13:15 -0400 Received: from mail-oi1-f196.google.com ([209.85.167.196]:41361 "EHLO mail-oi1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729318AbfIFGNP (ORCPT ); Fri, 6 Sep 2019 02:13:15 -0400 Received: by mail-oi1-f196.google.com with SMTP id h4so4017170oih.8 for ; Thu, 05 Sep 2019 23:13:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=lm35lqYANr7RWzXjWDYZwksjF6Mq+BmtoOr5FpRGY5E=; b=P1xzjDrAtEH0KIz7i+HCUC0aEUzA2M7SfWbAY6FsWDL8OowusO5ssEfZz/sK/Uqk+h dJ/BS0UAHHJ05fFUVw/NgbsLuQ7e3coOMrKY61LZ6iB6y79ti/DgUu92lmPYz54/DBT6 x1Sq/PSpJednu5kJ5/IrA2RJKa6wPWMzVI1Te2pACQUg2el+5fFExFCM0etK5c64I+Ft m+g9yVRH8A6Z0ZUOy5VlZ7S5ktwSGuxDxoA4ODLwaPc5mFrPA8IjnPRj2ecexyGQK4gl eymHGHphsyZDy3BwwFVBtIJ5vUueJyO+xpyLVIWdnBrRJb1cTM/nSWSANBl0dPANwDEl lNYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=lm35lqYANr7RWzXjWDYZwksjF6Mq+BmtoOr5FpRGY5E=; b=Yj52zHNLjAm8ZQJuCbKPRwDYJYGNlCKKGuHLrFnZbD+uNodRF4j7lNYPQUXMt2QDbK gNrnqr55Xypism24cDJgeQ8SwZjG0+3oNvU1752O+Wz0JJ6zAt/SYqrHFWRMk5LwowEr guhba0kdetvIzlS1eV/R/zT6rOVz+XS4YO0gj81Jd7928pfk+Px9IfXs4MdYk5lC0UfD HbWUflTomm8K6wLJ+lnBG17K7kbVjA7XToyui++K8lDlGD2ES21odzBzeiUQCwlbdmn2 hUSkPk1DsNapQMiv4fS65W5vQGsG49+UKHJZJDjscNq1R4StfBfs6iK3i0cZd+f7+wVW Umpg== X-Gm-Message-State: APjAAAX+FNjq3EaqQeCE8FfHlOyVT7w8+CIed3G1PmA6bfcwAKVpksqT s0B8NZuMMp9qd71kWzwesPNRLnk7p77y/K/S+WgU2A== X-Google-Smtp-Source: APXvYqxgRgIp9PLl7te0QKBxk5XD4f5D41Jbzs5TkdJh3wkUZL28Q0diIuyhS40O/3LVoVDWP1DXCnE2wi9B7aJhpXc= X-Received: by 2002:aca:e183:: with SMTP id y125mr5704531oig.27.1567750394121; Thu, 05 Sep 2019 23:13:14 -0700 (PDT) MIME-Version: 1.0 References: <20190905161642.GA5659@google.com> In-Reply-To: <20190905161642.GA5659@google.com> From: Baolin Wang Date: Fri, 6 Sep 2019 14:13:02 +0800 Message-ID: Subject: Re: [BACKPORT 4.14.y v2 5/6] ppp: mppe: Revert "ppp: mppe: Add softdep to arc4" To: Baolin Wang , "# 3.4.x" , paulus@samba.org, linux-ppp@vger.kernel.org, Networking , Arnd Bergmann , Orson Zhai , Vincent Guittot , LKML Content-Type: text/plain; charset="UTF-8" Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Fri, 6 Sep 2019 at 00:16, Eric Biggers wrote: > > On Thu, Sep 05, 2019 at 11:10:45AM +0800, Baolin Wang wrote: > > From: Eric Biggers > > > > [Upstream commit 25a09ce79639a8775244808c17282c491cff89cf] > > > > Commit 0e5a610b5ca5 ("ppp: mppe: switch to RC4 library interface"), > > which was merged through the crypto tree for v5.3, changed ppp_mppe.c to > > use the new arc4_crypt() library function rather than access RC4 through > > the dynamic crypto_skcipher API. > > > > Meanwhile commit aad1dcc4f011 ("ppp: mppe: Add softdep to arc4") was > > merged through the net tree and added a module soft-dependency on "arc4". > > > > The latter commit no longer makes sense because the code now uses the > > "libarc4" module rather than "arc4", and also due to the direct use of > > arc4_crypt(), no module soft-dependency is required. > > > > So revert the latter commit. > > > > Cc: Takashi Iwai > > Cc: Ard Biesheuvel > > Signed-off-by: Eric Biggers > > Signed-off-by: David S. Miller > > Signed-off-by: Baolin Wang > > --- > > drivers/net/ppp/ppp_mppe.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/drivers/net/ppp/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c > > index d9eda7c..6c7fd98 100644 > > --- a/drivers/net/ppp/ppp_mppe.c > > +++ b/drivers/net/ppp/ppp_mppe.c > > @@ -63,7 +63,6 @@ > > MODULE_DESCRIPTION("Point-to-Point Protocol Microsoft Point-to-Point Encryption support"); > > MODULE_LICENSE("Dual BSD/GPL"); > > MODULE_ALIAS("ppp-compress-" __stringify(CI_MPPE)); > > -MODULE_SOFTDEP("pre: arc4"); > > Why is this being backported? This revert was only needed because of a > different patch that was merged in v5.3, as I explained in the commit message. Sorry I missed this. I should remove this patch from our product kernel too. -- Baolin Wang Best Regards