From patchwork Fri Oct 30 02:25:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 11868255 X-Patchwork-Delegate: kuba@kernel.org 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=-12.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, 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,USER_AGENT_GIT autolearn=unavailable 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 CC0FAC4363A for ; Fri, 30 Oct 2020 02:26:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5F73D20756 for ; Fri, 30 Oct 2020 02:26:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=arista.com header.i=@arista.com header.b="gE8wG1tR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726262AbgJ3C0W (ORCPT ); Thu, 29 Oct 2020 22:26:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726184AbgJ3C0H (ORCPT ); Thu, 29 Oct 2020 22:26:07 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E6B0C0613D2 for ; Thu, 29 Oct 2020 19:26:06 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id n15so4860890wrq.2 for ; Thu, 29 Oct 2020 19:26:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=googlenew; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X1EQkh492Mu2jcFb695EkgyNX5lh9rVoFrBg9UQoeOA=; b=gE8wG1tR4G4yLkiIiDSr6+pBvfL9AatK9YzKQjSAvJtAyWl0lohZh3WNinOoZsmfy2 B2QsH5H9CrDO5Kq50n35BKQQwWdNUG9+arReDbUsG0Cyu0N5Eq4TpN3bcSWqf3cje1pr v6i9781D1dreCqxDJOLDihMwRYwqF/7NS46WjlzhePNElyciKkzP6JEVpIQ7jDRReedj +74xyh7/drTx5vkcz1SkFh/qP8GqgjC4rTpashBt04QTAQcDtlwshIfXGTZ7mUzIcwI1 IGbkjoQmUUznnlFElGFHHL+R0mO0XOsyNpCvX0kcHo4/hr2JtduUw8CzyooRbpldXg8G gXUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X1EQkh492Mu2jcFb695EkgyNX5lh9rVoFrBg9UQoeOA=; b=TEi3ELxWFijaLGnVxBlKQb7NSLomxYDRCH3Cmp3jw0HAHfwTRQUmWcFPxCuYGqFZqZ uYgcWYF09o5BwZCNChKJOrHszOj+dzhIIf/xEwtIIrUbuDDl4qrts7lnG4Cf8kedwVp5 icbYFtNWHZaADQQCiV4l2cCXxW+DRC7kB6aaadD7Sj0Zu5LYM1lOhmMifygxdMylhYWJ Y4+frZaUhQKG4vfsbjsssTTN8nlbpoU4JrTTAiFgqOl3SbC93t4TDt4i+/1Qzwg7Avas unKcGsuq0FOy7QEYJ4yGjTz4wKLrZfhcHMkH1lwcWSG7Vx2qc8tq42Fzn2I8FD5Hj97N MtPw== X-Gm-Message-State: AOAM5300q4E48SP0/I9gahnNtzMMjM57lR5MKjq+tg5ls7djzJUZyi97 F44mDQ14CEdEKLPSfNP6rU8Ul7YB0YLBaqkc X-Google-Smtp-Source: ABdhPJx8teNYuAv/WZxQLY7+jwpZuK1G1oCTxaw1VGWqelfSuG3g8UfppXc/mrFT+J0vhY7wV2DlFQ== X-Received: by 2002:a5d:490a:: with SMTP id x10mr59400wrq.289.1604024764926; Thu, 29 Oct 2020 19:26:04 -0700 (PDT) Received: from localhost.localdomain ([2a02:8084:e84:2480:228:f8ff:fe6f:83a8]) by smtp.gmail.com with ESMTPSA id i14sm2757170wml.24.2020.10.29.19.26.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 19:26:04 -0700 (PDT) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Dmitry Safonov , Steffen Klassert , "David S. Miller" , Jakub Kicinski , Herbert Xu , Hillf Danton , netdev@vger.kernel.org, syzbot+c43831072e7df506a646@syzkaller.appspotmail.com Subject: [PATCH 2/3] xfrm/compat: memset(0) 64-bit padding at right place Date: Fri, 30 Oct 2020 02:25:59 +0000 Message-Id: <20201030022600.724932-3-dima@arista.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201030022600.724932-1-dima@arista.com> References: <20201030022600.724932-1-dima@arista.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org 32-bit messages translated by xfrm_compat can have attributes attached. For all, but XFRMA_SA, XFRMA_POLICY the size of payload is the same in 32-bit UABI and 64-bit UABI. For XFRMA_SA (struct xfrm_usersa_info) and XFRMA_POLICY (struct xfrm_userpolicy_info) it's only tail-padding that is present in 64-bit payload, but not in 32-bit. The proper size for destination nlattr is already calculated by xfrm_user_rcv_calculate_len64() and allocated with kvmalloc(). xfrm_attr_cpy32() copies 32-bit copy_len into 64-bit attribute translated payload, zero-filling possible padding for SA/POLICY. Due to a typo, *pos already has 64-bit payload size, in a result next memset(0) is called on the memory after the translated attribute, not on the tail-padding of it. Reported-by: syzbot+c43831072e7df506a646@syzkaller.appspotmail.com Signed-off-by: Dmitry Safonov --- net/xfrm/xfrm_compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/xfrm/xfrm_compat.c b/net/xfrm/xfrm_compat.c index 17edbf935e35..556e9f33b815 100644 --- a/net/xfrm/xfrm_compat.c +++ b/net/xfrm/xfrm_compat.c @@ -388,7 +388,7 @@ static int xfrm_attr_cpy32(void *dst, size_t *pos, const struct nlattr *src, memcpy(nla, src, nla_attr_size(copy_len)); nla->nla_len = nla_attr_size(payload); - *pos += nla_attr_size(payload); + *pos += nla_attr_size(copy_len); nlmsg->nlmsg_len += nla->nla_len; memset(dst + *pos, 0, payload - copy_len);