From patchwork Tue Apr 15 19:28:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 14052613 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F330F24C66B; Tue, 15 Apr 2025 19:29:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744745353; cv=none; b=U3fSWwo8FNdcbgO3ZoXU1Krm4Djg1JgRQ7WH+Kq6pV3iM3G++JQcX8I6lQuvgsbZvzl8Vufm6Oz8UqanNXrkZlmr3q9grqV8ZmC8X83+xxLIA5lMPVVg1YlrLZFw2c61RrhTFWcSvQnPmtdyXWokHtqNh0Q7YiXUk0jD/LswTvs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744745353; c=relaxed/simple; bh=/0qEeGpvJtlthj0XEvHQzTGeK6rzfScWYxxhJaNAFBo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=szJOxyBFHIx6RRYLSLnSIkeoVNda5gGOqLxNaE8PRGV0FyKai5gTSbKVZjv/35tr9WwpL4Q+F7JG0U4vTJnbM/jOMOXRyGtP9nhdTXzaZFhW3xRmiyFnDooUxhsKtu/oHjgy1thiO1f69LgjjSgpDf+JNOXNRcAVhTiqaPfq4IY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-ac2bb7ca40bso1112340666b.3; Tue, 15 Apr 2025 12:29:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744745349; x=1745350149; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dCgtVrolqhAnENHpHb8PB2Kjmb9EPgq1lIBAqVwvwpE=; b=P1CqyuJBfDY7L/544r5WEhU0alYWCYwP1krDcXDoH4Gf6PFRKygRiju9ZVsI98hgxI 69FJRLZgtxmuEWOTMOa55T/BmqSlJNoneDVhF9KCC1aujUBtq61tE7kzBv8T6bjZ9kGH DQsNazJFkkAH5ixlASWUAxYBxrws526BUSzcu76dTzK9hjFS7h5F+x3P27ImRXYXhvd8 tsVTXjdyncCNLkJiFgBub1NInl5qYM5QdcVfo2xsF6i+7c4EDAAZ8UhSUVcuNdBhVC9C XCERWR3MHK17RSCSJZqS/Ew1QKM5ReQV+8ed6As6sbss11jr9eLKj8BBqWqXYdsqd3jX p3BA== X-Forwarded-Encrypted: i=1; AJvYcCX2DrwsmOyQQ/ARrcnM136/9c514ZbLe8g16q7UegIXax05gBq72h58h8Jfl7XS4xVBPJDuzaGpICWrvGQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/xKO7s1IxjxA4WMQW+KYlLgJWK6sNlxJ6IzoP7VcSTQMI83Gh oYuG61KjMNKUMFFrqHfo+Gjc78wBB6QYpMCRGvq3lHc813Tu+ucd X-Gm-Gg: ASbGncsK6PWodrvnU827lUpeZTglwcozgVx4rhSfuSfEa3RTFvj0X69sGuKSDPPcHYs OfK0f8iwXw8PrHa1hsMOXJ04NlHMf/aBFcnf5Fuat+oTR4w7aWHPDQgGxfaG3cqyr+ikzVwbtBn qGg+0/ZWmOmo6liED7vQrtwDZlZdLNbXQ9nO/jsdbkkXjYms+3fO+D/mhe7Byn6Xlf2xEYikR+y BB6QD4tKiEknyCJ32xW/iptMliKpDNUC9wSwb1ZS8BdRRbvbFUBFsmg8vqXz59bg2RyHoMfmaiJ FmRX9G1nT5xWpzQnWHIGLrfCc4LIPpQfwHAUqIqKFg== X-Google-Smtp-Source: AGHT+IGJEIIWAJLdpiq1/aoVLjcDmvAfjVPwDuxdL/CF8dk5dHr5H4aRse4u7FcEchQ25PdaRUQJNg== X-Received: by 2002:a17:907:6d27:b0:aca:a35e:59fe with SMTP id a640c23a62f3a-acb381a8673mr24965066b.1.1744745348932; Tue, 15 Apr 2025 12:29:08 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:1::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1be98d4sm1148483366b.59.2025.04.15.12.29.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 12:29:08 -0700 (PDT) From: Breno Leitao Date: Tue, 15 Apr 2025 12:28:52 -0700 Subject: [PATCH net-next 1/8] ipv6: Use nlmsg_payload in addrlabel file Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250415-nlmsg_v2-v1-1-a1c75d493fd7@debian.org> References: <20250415-nlmsg_v2-v1-0-a1c75d493fd7@debian.org> In-Reply-To: <20250415-nlmsg_v2-v1-0-a1c75d493fd7@debian.org> To: kuniyu@amazon.com, "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1835; i=leitao@debian.org; h=from:subject:message-id; bh=/0qEeGpvJtlthj0XEvHQzTGeK6rzfScWYxxhJaNAFBo=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn/rOB4Hks/uOdzS97B/+n3WvdEMT+s1o25lBMU Ok+dzlNOnKJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/6zgQAKCRA1o5Of/Hh3 bQ8aD/9E3r86asVBGhf0yR6h0lCZhb1IfmRUmJmuKxv01HKEafom33GHvS7JHRXyF67lPJ7Jn72 om/8q5oSc1sAVf7cpUPnBlcrK1Apj63t9HYCHznxoJ4gyz6ZlIsHn51imgKw68+vo6ScT/BOqal pK3DwDdqd6TQO/HC4oAvqU+feSE1oh7SY0Cb2W5OeGrTUtm11tjY9jFu4Ur6vhNVmzXKMJyKr03 r82Nubt4fTHeF6xGwE/VInTcsmUOji9TtPa5dyjh/HPehlRKP1KFro5YsRmRiz4caibzmqPNd+X nEcVksGKQIf6CsVMJu4Cw+r7JoM2+Es7XomqYBRw61bgewMc9vHKtRUwiryXuIgK4MuHTtq9Hhb PtKwDSAfUhB9ITgqqe/KBrgpn0lrogKIM+IC1GqkLp6oeSgRj5GtNcq/KCG7RxSb/TbyoXOvavu CgctzYuRy6DATyraTiCQ89DyOHLu596A+yKxAK+eCklA7xQoC4LXQgudn90juywRKA9vSm/yLiT wXU4XT4w7VqodFVFp7IWCBlCgRkI0ebrxs+QMVSpTMUCM3zn8ZOA/Dgo2osDZuXa/WnR+mzSsyc SZ4cbz4HLD9rOmUrMP6COUTsvmDHIlp5dkLPO44WaH6zwJFghFVvkeGZ774j2KfQPMaU8jQuwAZ ES3QcgdP/+aK59w== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Patchwork-Delegate: kuba@kernel.org Leverage the new nlmsg_payload() helper to avoid checking for message size and then reading the nlmsg data. This changes function ip6addrlbl_valid_get_req() and ip6addrlbl_valid_dump_req(). Signed-off-by: Breno Leitao Reviewed-by: Kuniyuki Iwashima --- net/ipv6/addrlabel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c index ab054f329e12d..fb63ffbcfc647 100644 --- a/net/ipv6/addrlabel.c +++ b/net/ipv6/addrlabel.c @@ -473,12 +473,12 @@ static int ip6addrlbl_valid_dump_req(const struct nlmsghdr *nlh, { struct ifaddrlblmsg *ifal; - if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*ifal))) { + ifal = nlmsg_payload(nlh, sizeof(*ifal)); + if (!ifal) { NL_SET_ERR_MSG_MOD(extack, "Invalid header for address label dump request"); return -EINVAL; } - ifal = nlmsg_data(nlh); if (ifal->__ifal_reserved || ifal->ifal_prefixlen || ifal->ifal_flags || ifal->ifal_index || ifal->ifal_seq) { NL_SET_ERR_MSG_MOD(extack, "Invalid values in header for address label dump request"); @@ -543,7 +543,8 @@ static int ip6addrlbl_valid_get_req(struct sk_buff *skb, struct ifaddrlblmsg *ifal; int i, err; - if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*ifal))) { + ifal = nlmsg_payload(nlh, sizeof(*ifal)); + if (!ifal) { NL_SET_ERR_MSG_MOD(extack, "Invalid header for addrlabel get request"); return -EINVAL; } @@ -552,7 +553,6 @@ static int ip6addrlbl_valid_get_req(struct sk_buff *skb, return nlmsg_parse_deprecated(nlh, sizeof(*ifal), tb, IFAL_MAX, ifal_policy, extack); - ifal = nlmsg_data(nlh); if (ifal->__ifal_reserved || ifal->ifal_flags || ifal->ifal_seq) { NL_SET_ERR_MSG_MOD(extack, "Invalid values in header for addrlabel get request"); return -EINVAL; From patchwork Tue Apr 15 19:28:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 14052614 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6AE2324C69D; Tue, 15 Apr 2025 19:29:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744745354; cv=none; b=pkfcxaEQGSY1tttoX4tFFWEFvqRxtZHmowCav5t9zujTTE/ONtCxwZppVGVZk883q1qYuWRYXRk4dr4jrjyhkRcs2LFGNfmnyIuBo9zOufSl7P+i1s97RDgfjhlx3PXw3rCcWXbTzlQE3u8nF9+n0KPZRJDer1sR2tx1X+14j9M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744745354; c=relaxed/simple; bh=DfIBCMT+6BUsIC40qa/OF087bN/29ObJUmGCZa0NpJk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CL9pGiezZ7mA7PbErUoMqWSqJyVqda5kCRQ1QfzYEak1JfbY4bHuZrTr47d3/EFbfT2RGyG4trT/34RIMlTkGkqimBEp7r3JztlUGGlFexXyBKnHBlIZiQADfaMh3ea4aosMjyxXRRqPa78g3ndL2fGM5XAelmWwpTvF4fjBEN8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.208.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-5e6167d0536so10938300a12.1; Tue, 15 Apr 2025 12:29:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744745351; x=1745350151; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zAllUsbZRKY5Q3B6oSHQ3YEpDIRJItkrkCfulUmg9yU=; b=FdWchtzMcVqBEJzQkxjpaaM4Sij+4hke/TXb9oN60VKoFsl372L8T07DOlBMKWEU0q MnTf+RnewEZ1MnGMtcIws0cgL1T/yCYGGBTn12QvhYPcALqQknMf5vmH9/A0ftQRstr9 s/SqtCn4+naPwGx55clDSNl/MePgUlIYdzHryGqRfijAFPPVBVGD8Xb9OZlfI6LJohxy rmbaOrcob8i/xFwgnD6GtPLY+gyFZriASfLdzh+5cOdRQxwK591+DYcsKtxlSec3JBfz WUPmtR2/2pdn1EpcoGx2GVrbS6U04J+VFJlecIepWtTqms3wWo/h/GsiWoKLgpLG9y5y ZVVg== X-Forwarded-Encrypted: i=1; AJvYcCV9cS7vqKWAWCcQb8gZQvMHuokxTaE1G9VyIdi1a1mZTKS+o47jMSW6QteAM7Fa3JFrRAO5ZGown+p3yi4=@vger.kernel.org X-Gm-Message-State: AOJu0YxcsE2i+DRxaMzI3ak+gow8WJTf05rgkE8DcLDvbY2iMPz8CAhm C1HCGxNOIobvg2uidRLb18O2cCMP/s/WPaDy/0fZUnXGAX3+vSuA X-Gm-Gg: ASbGnctwE/nk3wGcYSQ1ytPHCWjmmMDMGWKyeGxMJ+JX4cufer+5ithJNaDdlmhqLGU oTzTcKK362RsB+dwFlOzDkVKyxOiN7cRndWW5JecoPIIyqlKw5Ib2r6F5ZOB9wden2KCxhcEFOR su6pAw9PyqjRmk24Nh1k612FR8M0k3dpO4vYUfGb6efDzE/Oglb+AlJEzrRAfyjjGfydIUdMyRr q5wMV3bJbsl2AoJMkB9NpDyFlJnLZakDJCBeEJrquAjLYReXBlJ71IAtNQbiGvxvJXIn/2VB+Bs JurbvNAWai9v43UAxLlZd974O+vxHQEZQiPV2x/tgA== X-Google-Smtp-Source: AGHT+IHDxsjYASSE9b+bzZNilOFfJqod3I32o0Ynht0qVmZ9UCG0inBB5NLljmSHsOvDoh7PZRtFqw== X-Received: by 2002:a17:906:dc93:b0:ac7:9835:995 with SMTP id a640c23a62f3a-acb381b067fmr29335266b.5.1744745350469; Tue, 15 Apr 2025 12:29:10 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:3::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1ccd262sm1157633966b.136.2025.04.15.12.29.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 12:29:09 -0700 (PDT) From: Breno Leitao Date: Tue, 15 Apr 2025 12:28:53 -0700 Subject: [PATCH net-next 2/8] ipv6: Use nlmsg_payload in addrconf file Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250415-nlmsg_v2-v1-2-a1c75d493fd7@debian.org> References: <20250415-nlmsg_v2-v1-0-a1c75d493fd7@debian.org> In-Reply-To: <20250415-nlmsg_v2-v1-0-a1c75d493fd7@debian.org> To: kuniyu@amazon.com, "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1068; i=leitao@debian.org; h=from:subject:message-id; bh=DfIBCMT+6BUsIC40qa/OF087bN/29ObJUmGCZa0NpJk=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn/rOBh112PYvRcXwd6GVmpZxW2pBffAHCKmLE8 CdfZalBlLeJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/6zgQAKCRA1o5Of/Hh3 bSzRD/0Z1UhaagcylfT8dUgVketr1F4GfKI4lfHfevrS+AcmLCD2Re4EnMz13u5AdHEJeb2Dqpb S0hHXKQC8zLBqET6UPyyhTAj/wNuifJvtZj1bxA/wiwUmYP4d84uNqO/kR+t1G3QrF/5r5yi6Y8 OQM1ygnb8tS3h4ZbviNGSe2YXitDVZMCPpXfaYMOk5mQpgU2sUGWwrRHdwCnVKJdCu5Mt4dHko0 aDlZcKPFtQzTGbCBT0K3EGO5nwD+NjntAIFc1aBFGED4xRXyxxcnp3lV2NstOEZ2qhsKpKMR614 3p/o7xk2iIFlHuvXXj9rZulWIMllXo/V1JRgAvwrCzzrRWIWuTfbCNywSuoCxAboyWG9ykV5fm0 UK8znz+gqcexWXVIk2OwLZ7o4cVAoAlr63fA3ARgczTEsYANkOU74+WzCZXmi+cwUO/r/W5zrMS 7ROmeHUSAGsWH5naqn1Wl/s+trRsRnqP0LCfvySFp0cP6r6KOFPZdNMfReycXiEe7toZHADsMUP SfKDN0mowilTFIn6bCcmj0ojRPz0NEFBG5EbClhuMLikYTX8G7l2zwVFEXEP/xTzA1YZAm8eXPO IyRJyJJqwI5MnbwCCMeWJDtxtffdRY4Der0mbE5cX7RL7aKCA6YcZyjPrMVt+vpgjWpJ5+8+Czg AwD2Bab92TX+Mww== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Patchwork-Delegate: kuba@kernel.org Leverage the new nlmsg_payload() helper to avoid checking for message size and then reading the nlmsg data. Signed-off-by: Breno Leitao Reviewed-by: Kuniyuki Iwashima --- net/ipv6/addrconf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 4af2761795428..ec6c4ca6d6d99 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -6112,7 +6112,8 @@ static int inet6_valid_dump_ifinfo(const struct nlmsghdr *nlh, { struct ifinfomsg *ifm; - if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*ifm))) { + ifm = nlmsg_payload(nlh, sizeof(*ifm)); + if (!ifm) { NL_SET_ERR_MSG_MOD(extack, "Invalid header for link dump request"); return -EINVAL; } @@ -6122,7 +6123,6 @@ static int inet6_valid_dump_ifinfo(const struct nlmsghdr *nlh, return -EINVAL; } - ifm = nlmsg_data(nlh); if (ifm->__ifi_pad || ifm->ifi_type || ifm->ifi_flags || ifm->ifi_change || ifm->ifi_index) { NL_SET_ERR_MSG_MOD(extack, "Invalid values in header for dump request"); From patchwork Tue Apr 15 19:28:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 14052615 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E850624CEF9; Tue, 15 Apr 2025 19:29:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744745355; cv=none; b=q/KL4Xuja4QXJ1J7BjTgXfT+5JmFoP3ovOA4fovHl+jx+WqFYwAVqVJI+DSg6Euv6vGEMROXCUtgb5Cn5+uEFXuCpnIA2xeUm6p3HFIGlHsKUsnXx889BDVqUOV0BSGFhuirI+jtwGP+WrLicJY43R8camSZe/4xKkbj+cS16Kc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744745355; c=relaxed/simple; bh=+CFJmN6F/h1aJVdMxgj887nK2pULtHmK36nsWYuGQS4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rZdvOXBRhjVaeOE593D+1WPUk31W54Q/Ev0c6yqAZ9Fc30dvkuP2QAAS97CKUY1TLFCZ8FLt4DyDvI+8LHNuqZqYuRA35Je8m6yAGgTP3BpbapjxftLpe2tqTnkQdUvKFk8D73fC4299np6qbhb/OthwJc/zkjln+joxTOf6RZ0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-ac2c663a3daso1093966266b.2; Tue, 15 Apr 2025 12:29:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744745352; x=1745350152; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MLFwV78SmluYq1I05RcZImjhpchW7U2CdM/dSOpLYS4=; b=qRG+Wfzel+MzkG+Q8RW2EOi2dPm9Ypl+5g/eb2QSkdE9BsdkU+uiJWQf6EH4YBWqe+ xL0Eh30Pp+vqd5g+4vZbIdQbYpmsIcJB8rcCF/+VEtT4LoVA9duosKPJNlqDKFoT9HzU 4veWW9iXmiWModtfBF26IP7alx1dCaoPKuWCFzXoSY5ndl5LPCShaKSVca/oqH79II0g LRCv7a2amHObEbOivxJvM3AvXdhgqlPSfwPGUwk+ySZ7R+IgddmBgi+z6fo45/GT4WGW uvcuTfD5+PnnWzjls/POF84mcV2PeTLdRo2u7BKD2jRf/GAUbb4aluhD2ZI4i4nfrvoD H2sQ== X-Forwarded-Encrypted: i=1; AJvYcCUUnhPG7wvsQ6G8lHx/W9ChoG/ofWiK7L2mlcYJsvNWUV+Dt3RIpEKslU+xsGusBceZrKdgauSXw2YJsPU=@vger.kernel.org X-Gm-Message-State: AOJu0Yxxvu/8+ladklgHkBH1tnNAZ63CJBuNiAwO6Z7oyD4YZo3VS4Jw v6YL/vKYQNE0nrnAVQFehlT0h3T2lgkljiqj1DAt/reOzaDG+eIMS25Xdw== X-Gm-Gg: ASbGncsKRgXJm+5dJraC7JhtUwksu3hum9+U7DjLDN9wfBMdfTCG56GFx+/UX7nLId3 7/EO5Eh/+A/aEVrd5eqLk5noI6sEWyyjm1T3PBASiBPNWsMuRXUGZvZQqlZhFJ6r3NrJLk8y1pl HJBiy51KZ4Y9jlZz4zmHwvM2rOeCgOXWwUCXEiHkRawuYFoH812TWCKBzixr7sTPueYV79W0VUD NLWH1sn589oVvnsJ4f6iHVvYP3YhEjj2m+iT8g7hz0119HJgBa0eEO43OZWZ73ncXXUSm3oOYCh Dr7E2KPjcCRqNM/HRAJS6R890EErR9c= X-Google-Smtp-Source: AGHT+IE37E3kuW2dwBus5vXSASWM32Hama/1q+on3F4tb/DE0fxr68G1f0FBPYvl7x58VNfnRgiWnA== X-Received: by 2002:a17:907:6d21:b0:ac7:c79d:f8ce with SMTP id a640c23a62f3a-acb38546358mr24110666b.57.1744745351949; Tue, 15 Apr 2025 12:29:11 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:9::]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5f36f5056b9sm7071425a12.51.2025.04.15.12.29.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 12:29:11 -0700 (PDT) From: Breno Leitao Date: Tue, 15 Apr 2025 12:28:54 -0700 Subject: [PATCH net-next 3/8] ipv6: Use nlmsg_payload in route file Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250415-nlmsg_v2-v1-3-a1c75d493fd7@debian.org> References: <20250415-nlmsg_v2-v1-0-a1c75d493fd7@debian.org> In-Reply-To: <20250415-nlmsg_v2-v1-0-a1c75d493fd7@debian.org> To: kuniyu@amazon.com, "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1135; i=leitao@debian.org; h=from:subject:message-id; bh=+CFJmN6F/h1aJVdMxgj887nK2pULtHmK36nsWYuGQS4=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn/rOBYh6m6RQqlP3zSzn7IwObS8A1BIkD4oq0A T0LPoG35/aJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/6zgQAKCRA1o5Of/Hh3 bR4LD/43fZnIncBLXVH0CUSEPwW+W4bGFbdYvsn4k5TYHONgzdPBRS8YPdGs9FFAW4HDLX2C4me VISBoLeNYDVE7sh78pT9U9WMYLuEYNJfSSyTEOmoH79a5++dUD3mNOlZ3KM6hiWSrlL22d1o4hR avfVvdSEAvf7c7RwDpRQ7t8g9zORwk6tzUZSuo6wK9cSeDSnSnlxyzWvpF8oq7RANennaoritMi fPFmOOLrCYLf/OZo0G7Wz8o2bhRMNnBrT3TuBhTXJaGEXmoJ7iAW7e96oVN4noMD/k/dP60zN1Q 5HriegLn7cmgke53JiI/Z6QxddQWEVTZceaQ9Dsn6uPkBiEUxVgN2hEzrVHhouwX1h4ZBS0KAi+ N+GdXAnwGLxuU97HGw6v+18nZcZPh4Qpyaz524qs4OY4HvuuDQG2tKJ6kN8PfFJsDaHGTcrfTQz JM79ckTZjsYpozuhp0u7bwn8tn95+uR9FFn+LMMrbFGZ5NGgZx/04SYGjEUF8UkFBvIS2jke0rM gC91nXRS+KG0crfgi3zkzl3Bpf48LKu8IZu0+Jb3AJqKlrdp+z9r5TI5ClZeArAh8g6QXI1S1cN 0St3RTovftihk60MzY8rwkJH94VG2Ur0zKr6VRkPVUTwIlehoHdv/J7gZqlTYCIGdTMu5XPQrAW v3ScO31Xyan76nA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Patchwork-Delegate: kuba@kernel.org Leverage the new nlmsg_payload() helper to avoid checking for message size and then reading the nlmsg data. Signed-off-by: Breno Leitao Reviewed-by: Kuniyuki Iwashima --- net/ipv6/route.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 210b84cecc242..e2c6c0b0684b2 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -6029,7 +6029,8 @@ static int inet6_rtm_valid_getroute_req(struct sk_buff *skb, struct rtmsg *rtm; int i, err; - if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*rtm))) { + rtm = nlmsg_payload(nlh, sizeof(*rtm)); + if (!rtm) { NL_SET_ERR_MSG_MOD(extack, "Invalid header for get route request"); return -EINVAL; @@ -6039,7 +6040,6 @@ static int inet6_rtm_valid_getroute_req(struct sk_buff *skb, return nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_ipv6_policy, extack); - rtm = nlmsg_data(nlh); if ((rtm->rtm_src_len && rtm->rtm_src_len != 128) || (rtm->rtm_dst_len && rtm->rtm_dst_len != 128) || rtm->rtm_table || rtm->rtm_protocol || rtm->rtm_scope || From patchwork Tue Apr 15 19:28:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 14052616 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 506A824E4B4; Tue, 15 Apr 2025 19:29:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744745357; cv=none; b=cCLUzIm3rXggUnFEphNLkhVoPXTnvMjS8wnguZTbqim20BVHXaixO/hMYU+8w2w+Pha9y0P2W7M+9Tu8cD1KZBi43PYVDxqfLM5g4cA2Ht5KLWY9bakkK2sJ0kCcmu849YKZxbsRzPUQyrX0/GwRTgXLUtiZLGjhbuiVjaqFzCw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744745357; c=relaxed/simple; bh=2bK9fPs1R9AfvlCTLInBKMOYe/zXdGmlrahhJS0gxqg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mNS9FnUlEw4Xmp/U+UXXp1tVYLKQjaXLcLy4UcU6XeVhhGyXhkA4Mq1pq1k3tzvbRJSlHgA9Afrlc7n3T2WoiFEVxLvTD9H2AB31bc9RtcIQnBdvICjHsaAKj6++JAekAwfNQs3Hm07oI8HGu1Z4PTyBSZYxDeIXBABJjVIkIOE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-acb39c45b4eso3264966b.1; Tue, 15 Apr 2025 12:29:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744745353; x=1745350153; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IB+0Pf4ztxh0w6HNNRAsrb3R+cZgfswKfYgmIp/HaMU=; b=JNzzPQTuaLNfafHhT+vzW6Pqv6dqez3fy2VQ4U2ASyIPMJNu0PgZ9NtGhGPrAh0cub NtdBMRCuQzaPNAjhXNiDUVhWOMadfRrWm2EZEKf/KgwqJdBLzlD2eJA+cR3IeWtULnKJ 2j7pKXinw7tkC5rn4EdN907+zxKjC3R5Eb0EclzVLfuzj43xztWzqAmxHuF83ZFBFO7K xrK0Dcl3dK/NNHSJS/ZwSdqqxLOhZXFADgRc/ks4Yl1qmI+d5R8ixLZhl2LT8vVqM6eA jZxzKTZMb3AvaWNpQod1Y3SuVGq6xhopM5vRMNs5t1+onXobhGRNifPqKs5DnlSxOry9 1ZNQ== X-Forwarded-Encrypted: i=1; AJvYcCX5jaA3Kz68STW8lkqFpQSwQLqsk/ninvx2SZ+q16D+P0AOxBLOr0LWb306Qj8xK0Uito56TpoHET+unuE=@vger.kernel.org X-Gm-Message-State: AOJu0Ywr/rxZGb+E/Uz/kAuAeD3TYDfyZ519x/gavnqTvOHcigryFUqb Ej6GO0ZkxrdEHIYPwWlrQ17opB6uHxDzEh4FTbj8n9jf5fHS79nv X-Gm-Gg: ASbGncskiXAiCgMOuyrQxj9sBe0XUspV+ddSV+jZtc5GO/pV23tnDIx8ORwf3hywxLB J0Zy1eCa98tiTRit9XKleDo+P2slpRLuolw4q260m6vZGtIFXDkyFYBmypBhzUgZAy7F0SgdZqL 5xNxKzcOGnGDc6sabtZHWPNsfJaTKPJDd8KOMiXIrGCHWlsR+irbiAMHMQdtwqD2Ec/n3UAPAe0 ZhGcMS4FrPv8neGbP41Qh3OAfUKvknsIYPrTrjF8+RJUAnXKLQfIu+Iu/zAJCYWxgfZvJmqH0Fd +l48dxCbHrjoYCVhP6Bna6SQXj/Hml4= X-Google-Smtp-Source: AGHT+IGhcE7UsZXqgfakxmLRpPE6Hlj6C3GDZvKpkuseFfdxuIwtJXkO13LJUmGb8oW1BRfo9NotCA== X-Received: by 2002:a17:907:3f15:b0:ac6:f3f5:3aa5 with SMTP id a640c23a62f3a-acb3822aabdmr27669866b.16.1744745353452; Tue, 15 Apr 2025 12:29:13 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:1::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1ce70c1sm1150581966b.175.2025.04.15.12.29.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 12:29:12 -0700 (PDT) From: Breno Leitao Date: Tue, 15 Apr 2025 12:28:55 -0700 Subject: [PATCH net-next 4/8] ipv4: Use nlmsg_payload in devinet file Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250415-nlmsg_v2-v1-4-a1c75d493fd7@debian.org> References: <20250415-nlmsg_v2-v1-0-a1c75d493fd7@debian.org> In-Reply-To: <20250415-nlmsg_v2-v1-0-a1c75d493fd7@debian.org> To: kuniyu@amazon.com, "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=964; i=leitao@debian.org; h=from:subject:message-id; bh=2bK9fPs1R9AfvlCTLInBKMOYe/zXdGmlrahhJS0gxqg=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn/rOBkUl3jC0A1kyIEmHRZ/sX0sUnwKnlP0bN7 MM2W/XiTziJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/6zgQAKCRA1o5Of/Hh3 bQv+D/9r8CO+tEhmHNxLHy4CMNQK85KFGRq3i/DxiomWkQjNNepMuCWF3OUov1fomBUbYDPKcgC Z3YFvsfaXrGOHZXOMEiQxDtClXaPfOiyvH26ATTisQwiOsxDyXH50RLpLfnyByKccM9QZEgmU0H znDaqesw/XxI7A2JmUXK8DsL1icvlxrAo1Vqcma5oLmjbZKuY5n1euXkVglvCdi9n7beyk8DAp6 7qGpkgCONvTRHbMGKmi1SzkuWw3o4u4VhdZfJMZS/JrrW7kZyYrpl4lpV6PLoBkeqfsfEgO7pGY g6PIu3IG6BmzjDSkzBYAno3MeUrUahckc/NWMO8L60XFVazu5y4BrNZJTwS7c1P2eMEHD50W3G/ +aZ9ePsbY+xmYor9d457EWsSUpQYhP2Lx90G2gnFa/w6wGYMh1yYCPwxmEreBgFzmvfSVQY+Yyp 3578YjjnXbHY5mfN0pc2biVCtcdxoBFHLWHC9nYZjH8mdTuahBXBGg6qADX3+t/xUQWjgXCSrvr uqGFWZokLaklnYrc1HdgwYGLIL47HoP8OpuGQhwykJmCYFG0U6OEKMi/20DwYGPCBEfDxtZbdJM GbOhqTnqAM1hqX4aiH6GoLwv2ifoSfHwu362H4oiMlHSAiXC78rF+1REQetBiIyzW5RSl7UnzOz slIFNKrKOFy7PGw== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Patchwork-Delegate: kuba@kernel.org Leverage the new nlmsg_payload() helper to avoid checking for message size and then reading the nlmsg data. Signed-off-by: Breno Leitao Reviewed-by: Kuniyuki Iwashima --- net/ipv4/devinet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 77e5705ac799e..c47d3828d4f65 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -1792,12 +1792,12 @@ static int inet_valid_dump_ifaddr_req(const struct nlmsghdr *nlh, struct ifaddrmsg *ifm; int err, i; - if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*ifm))) { + ifm = nlmsg_payload(nlh, sizeof(*ifm)); + if (!ifm) { NL_SET_ERR_MSG(extack, "ipv4: Invalid header for address dump request"); return -EINVAL; } - ifm = nlmsg_data(nlh); if (ifm->ifa_prefixlen || ifm->ifa_flags || ifm->ifa_scope) { NL_SET_ERR_MSG(extack, "ipv4: Invalid values in header for address dump request"); return -EINVAL; From patchwork Tue Apr 15 19:28:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 14052617 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C244824EAA4; Tue, 15 Apr 2025 19:29:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744745358; cv=none; b=l3jS2TP3Ko8VWw1YNqL8zWroOaJamc4U20YF0gZtvQi/YwZOtJNuCk3N3XnRPC6EprDa9xFMmAy9kp5HMJ4P0/NdFuEY7ErK0obmfHCm+dL6LFVonQmyatZ7QU1xAIuHUiW/GBnWXeGzCHtmWgmO11Pw58HUqbIXu1IT1VBAEGM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744745358; c=relaxed/simple; bh=uN3ogHRpI9nLK6q6EkD3At2EWCIYjks6iGYMbyhg2yw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ABF5PVeGeWJHQqzudP99LVP1K9rTTDyVb57vcONgw8pmVS/WyQ54kSTEtBZusMz5f3GP5bdHOZSdtnEDO4difNE8aRPuLiEBNBDfZ4NQXpOttdL6bOh/o7mwNXI2ad8BTAXPJcKydJXAhBxlyKp0Kx4uyeJRBY2mq3xGzSqwv7o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-ac2bb7ca40bso1112356566b.3; Tue, 15 Apr 2025 12:29:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744745355; x=1745350155; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VAwU5RndzmNZ5o/+QpbFf0rYkVKNiHj4MbrXWCGbp+4=; b=vA1BzuD6qQn3CwEs+/pGzj/AwgB7oCnq2Bw380EBSET5XiuESeFbqEZ5lmT8ehhdNr SpWO6gRszc6QSiiV8O5NxSXxGNQb1qcjRyYBeWaP9U7mTSBg34hqteFYoZajoLD32KZk DD+6YrwkpJgm4BQPfg7F7SkD76faKs2apbZlUEi1TxW8Yhn2auIcRZ/xSQp2ejppqP6i pLE6zQHzvb093rrgZo3oO0Uns4jqmTMqY5mFsangdEHn4HOtVkObqHxx1glBKpjt5iqT rN8R582gWD4vBks5vF+AT1TEAK6cFgW6VoNjKCfnA5ERt43R/v7Wh1/VNcK8Q7uA4L3q mDWA== X-Forwarded-Encrypted: i=1; AJvYcCXq/58bv7b27+P3EFvxxRxqvhekg3AKLCGm8h9r0OGfbOvSfYwxwBqajJTD/evbBAupA5cwXWUu0EVjCx0=@vger.kernel.org X-Gm-Message-State: AOJu0YxQBUtMuvdY8elXbkn2g8v55whZcnrlxCP3HPT8ZaCkLC9O7Qu7 O5fwpdtShWlSXj9oXm4wNr/1yoD0Nq5CCtzv7yZdJgsiQdnSIYiM X-Gm-Gg: ASbGncu7QlshSJcPYItRwLmxU1Ur4lec12rQzo8LZwKSl4DQS1y5s2kNN426vUgZezD QjvxGWUuxPl24FxeGKhryBItgSVg1dDg4UfQyEvj0QVqzd3QenPQ9Ov+Pcl1Wr8+YLA9JlMxAv1 Ae9/orj30UTYmtNzabFluQNWMJJorSqX1Ie1jAeWVTmH9zVUXidSqkEyxOOxfh+raoBmCt7F0FY n9ys1W9yVcFTRqSz8exnnUPNBaf9AIOLQn1pG9KZcg51WhxgPnrg60a676T5OrSgfLyTKog0ibB wvI6tBCMAWj3g9d1HEzZXkCrcGXIsps= X-Google-Smtp-Source: AGHT+IEX6QPFnjemB4tceukGjpLsQs2uSFso0ea/I1W0FqBrFdKoIzaJdShQgcYAkiJbcTTB/mdPFQ== X-Received: by 2002:a17:907:7e8f:b0:ac7:805f:9056 with SMTP id a640c23a62f3a-acb382c3c88mr26683866b.32.1744745354859; Tue, 15 Apr 2025 12:29:14 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:4::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1bb3159sm1150473866b.37.2025.04.15.12.29.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 12:29:14 -0700 (PDT) From: Breno Leitao Date: Tue, 15 Apr 2025 12:28:56 -0700 Subject: [PATCH net-next 5/8] ipv4: Use nlmsg_payload in fib_frontend file Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250415-nlmsg_v2-v1-5-a1c75d493fd7@debian.org> References: <20250415-nlmsg_v2-v1-0-a1c75d493fd7@debian.org> In-Reply-To: <20250415-nlmsg_v2-v1-0-a1c75d493fd7@debian.org> To: kuniyu@amazon.com, "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=982; i=leitao@debian.org; h=from:subject:message-id; bh=uN3ogHRpI9nLK6q6EkD3At2EWCIYjks6iGYMbyhg2yw=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn/rOB00iv3g9B+6aRBKlvLwjykIzUEmbzgswoE kgx747lkxKJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/6zgQAKCRA1o5Of/Hh3 beXnD/4zur89K9N6WDypS5kLqu/FjzTP1vJJGquJ58bLdlIn+bv3+HmaBSQqd36enqIza8J3lOB T9zzuwLbtn7lo2xauNWsmddcgg4ZuZ61afYb9QwtAIHaBNRm/pI1tSBb+dISqcMDRjqPJW3c27E XjrAzxmJh4zSlwmDUniL+fqHGzqc3FE3wJM1eT3GKRV6WyNn4eWjxcM/ammEVUWpteCFbhr836O Te++5fxheSI19XC4GIqp6Z6WyeKvj+th6RdO67Mv9mQvVCKAspAsI6lj3yH9vJefP5TyW8LEXIz m2QGgq1Y9zNG0epiRUVxWkA3nVm3zxKg7umW9Zg1pkx3l9I5+C8yQmmqZsF4y882luIyelMSO4D 6bTP5TfwqxOZcIHJCs9ezAzq5CO2LOM3QLjRPyxuHsjeSXKIG6LoevodwuD6tAtAsLfBXmL3uYQ dcDcxY0BKszQTAblHMTmqailksegvWNts/rfc5ibgqEeR8sb6yMDoXNhpt0pl4nOVl2Z/TBvB1+ fxd5jCb/DyMEkxesCZ37+uhyIS/Ihird+dXvpVFaR1zoOSAT8ujW4nwhASGLJ/gLPOzrFiZz67a IdQEaaFzES2swJSE5TiDJSYAjiGXALlJ0UGmAIqSX4gvQz+8jUkqV9zTJwIfApSdozQHLCb51am hWBJ+B4uYCBMnlQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Patchwork-Delegate: kuba@kernel.org Leverage the new nlmsg_payload() helper to avoid checking for message size and then reading the nlmsg data. Signed-off-by: Breno Leitao Reviewed-by: Kuniyuki Iwashima --- net/ipv4/fib_frontend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 3f4e629998fab..57f088e5540e2 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c @@ -948,12 +948,12 @@ int ip_valid_fib_dump_req(struct net *net, const struct nlmsghdr *nlh, if (filter->rtnl_held) ASSERT_RTNL(); - if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*rtm))) { + rtm = nlmsg_payload(nlh, sizeof(*rtm)); + if (!rtm) { NL_SET_ERR_MSG(extack, "Invalid header for FIB dump request"); return -EINVAL; } - rtm = nlmsg_data(nlh); if (rtm->rtm_dst_len || rtm->rtm_src_len || rtm->rtm_tos || rtm->rtm_scope) { NL_SET_ERR_MSG(extack, "Invalid values in header for FIB dump request"); From patchwork Tue Apr 15 19:28:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 14052618 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B8E124C090; Tue, 15 Apr 2025 19:29:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744745359; cv=none; b=GHzm6YZGcDUbWIpUFzX1gFYgFjzfwdw+enR1x1ZeK79fJ2xtvSrGC5NxToSdxpxCayNYV2YptGpCWg6lapUxShPAlVdqIdw5W6l6a0TN3vXR4UtVgEsEifaaMJiJ8ggSqiqswpFg1dKn4nF+SEiIZFzFB83SCeNP5+Pg+a8SYT4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744745359; c=relaxed/simple; bh=09yM9J35GfgWV0AIfeBBnAq/ohKxlMOU9G3h6LAb0tc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DnUTXYUC13TiJ8mIOVc2kxf1Ap42Sgg/7GL41/40WUfWazRDPF9RVPBrGb6MrGQhMDIcftP1xO62Jiz0HqZkQhfyfbpJLKBi0aDB4+21t3imPBdhLsG4DilYFOp//1ipdKcWgNOr9AfzfazHoUU22fYlxJmufaGKylt96yB1xR4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-ac3b12e8518so992015666b.0; Tue, 15 Apr 2025 12:29:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744745356; x=1745350156; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=35YdohwXnzbdVQmtCJdyFZZ/ZWY/+ILI+5o54QUi/DU=; b=ZmoR8aFEyMyoFTo2/s0yvBvZ5IZwhjTLlgiE3GDjWPKgmIcop7ZK6ZEEuxsjs8aYL8 zYJqU0PJTGg6lG1rMxoD3EWvuzSm8BjNVaYR39+HPjft3I6ZqC7PVni0Fgt5cA/X772m NtbOXt3h9FweMimRgB2jUdVC17ZZhDe58Cp6DNoI0/GGoBnJ0bnHpsika6NknpFsRqde jdyjQcTjU/A9pQNPZKK/1bWyWBwZR8HvQKtK5Hr++okurBlMdunlZwPgiZTkAY2/Y3Fq I2PFLTSKfiBqNIlDgtqVg4QzQtk1qa/qh/ZDrz3TK4MimDZtipvwWGPJ2gYxcLeEClau ms0A== X-Forwarded-Encrypted: i=1; AJvYcCVtvdi/8xU6XO0Sr6zJfw/z8LBSlPUEWOCeB538FH46Fl7iTHgsQBZ3WNu7c4bPVeBHTOas8JXjTO/EWRk=@vger.kernel.org X-Gm-Message-State: AOJu0YxHsVRrNNgm4jX1g93FgMWu6lHs1BrQCcVvcpGixFAS/lVdxD4m drRRKa3SsieYDXvVwaCdeFtUvO5s++BfuCb2ttxHJXb70tmpFHOro8UKFA== X-Gm-Gg: ASbGnct+I7uX6i9RBsGeknlQybnKnIxgyKYtjUpDHDOjt2mQSTt+/5RDF5RD08wMRYU XgYA4ARQdCiyfBvzksGcOQPas1mvB26TbFKv6MXbE/BC7r3WZ0ogRCLJgC1Amf4Z3vP8NbFqhqL 2EPI4Ngwrb5o8xVzIEyb5UsRUP1UseIEuIE9ZYd0/xrrQISfUWIU8ljRWSuKDFClWb0BirXE/gz WSzk5F28xsleVC5t5tYvcOu0EMsxEWHvATUaV8FXsj76MCn0sNlDCmJMsj6uhmihe2m5JXiQtob pmxA8VX+93DGrgkqDO72iWOXLTPmSEc= X-Google-Smtp-Source: AGHT+IGfZjFEc7/v21LrsVqoLPArkKth20mKlNHBTPmKgiTUhPE6g60tqQFY+zX/bMyO1TBNWf0PkQ== X-Received: by 2002:a17:907:2da1:b0:ac7:9712:d11a with SMTP id a640c23a62f3a-acb383209b4mr24799766b.32.1744745356243; Tue, 15 Apr 2025 12:29:16 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:3::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1ccc0desm1131759766b.124.2025.04.15.12.29.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 12:29:15 -0700 (PDT) From: Breno Leitao Date: Tue, 15 Apr 2025 12:28:57 -0700 Subject: [PATCH net-next 6/8] ipv4: Use nlmsg_payload in route file Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250415-nlmsg_v2-v1-6-a1c75d493fd7@debian.org> References: <20250415-nlmsg_v2-v1-0-a1c75d493fd7@debian.org> In-Reply-To: <20250415-nlmsg_v2-v1-0-a1c75d493fd7@debian.org> To: kuniyu@amazon.com, "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1118; i=leitao@debian.org; h=from:subject:message-id; bh=09yM9J35GfgWV0AIfeBBnAq/ohKxlMOU9G3h6LAb0tc=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn/rOCYjDVQHohl8ke3E/Z2RnlpMz8+44bJsLMa Ar4Dl9qj2qJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/6zggAKCRA1o5Of/Hh3 bcZsD/9p9LTtA19A2Tbx36wi1j5D8k1cujJiqUC8s++2zKUBZHzlPnpVLQuYCU8CclEe6w3oyYp gDgc9adRtIXGcGYUN/Fb42l19nFBDvyOxW7cDNJ1H0O2xNR+OIjsP8IFXYKhHo8ZvesukJkyFA5 6/N5TXZsZQ43mnQr3XWV36lTedbzMC38Oq+kOwVnvz7DK+u2KMvQfpA/9Eog2Bas06FvpUVLGCA F2aTRlAuccHQWSoJYyfqQc5uBtWt07/IPGNKaFfEkW7BqqhuHEzMBi4HVF+1+kEKyt1qEDg6JHA dsuxwDkN0Ez6YZjp/r0itQY0NiGN3FLy+ItOy4UuR4ze1JlNmEEhxF4kzI8F8bh5ukcGHnD3RrD Sno1VrG4j014RFLwJsT6qnEtXfU1jr5J3dKWT0r9j5iNyCuG0NhNwbJ5HIwxlcD1vn/J4tZ5NdH 5gjHiYNscTFQ968sLswNgoPA2j+7O6MaB1mniVXpv9f0JO2VPRfbFfKoIvGaWD4dikkGO3AECWN lVgpVobDRMv/71PvPJh5NLV+tE5hhqdLx9jBZALmy4rHlDQoWrpBnmSWRA9ocjYc54SIRdh2F+v x0w8KonV3eWJtfSKCIGZT45nN8wfjIaXEeP/JImSGKuuuI7hj/ub+auePuN7avwWe7tAcroxFjD 5+VniyQ6kXTamQA== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Patchwork-Delegate: kuba@kernel.org Leverage the new nlmsg_payload() helper to avoid checking for message size and then reading the nlmsg data. Signed-off-by: Breno Leitao Reviewed-by: Kuniyuki Iwashima --- net/ipv4/route.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 22dfc971aab4b..49cffbe838029 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -3205,7 +3205,8 @@ static int inet_rtm_valid_getroute_req(struct sk_buff *skb, struct rtmsg *rtm; int i, err; - if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*rtm))) { + rtm = nlmsg_payload(nlh, sizeof(*rtm)); + if (!rtm) { NL_SET_ERR_MSG(extack, "ipv4: Invalid header for route get request"); return -EINVAL; @@ -3215,7 +3216,6 @@ static int inet_rtm_valid_getroute_req(struct sk_buff *skb, return nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_ipv4_policy, extack); - rtm = nlmsg_data(nlh); if ((rtm->rtm_src_len && rtm->rtm_src_len != 32) || (rtm->rtm_dst_len && rtm->rtm_dst_len != 32) || rtm->rtm_table || rtm->rtm_protocol || From patchwork Tue Apr 15 19:28:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 14052619 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7E6432505A2; Tue, 15 Apr 2025 19:29:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744745361; cv=none; b=Q6BlEazSIB8RU2zqAHL5eIkDTwmt2+vqkLZo1dvnpCCVECRm5NB1WxwqbPXWXpnapDwwIxT2Yf1xZFBqz4iLtqhBNkDnqyZAnBS+hJmA82A27CNDavWVzZDwhuSa/GE4mahr1E6fci7UcCvLj+CbbEsksi+ebdZr021NIq0cJmI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744745361; c=relaxed/simple; bh=nxywYiBmzJG5ZGAgxVmCJ72hCLXBd9nxLm5C7qQo6Lo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rhR0F2gxBJW/qKIG+yJNmD4HHo6orWF3lac0l5cd5NHYp3MWszOo9VeZ51qqz9yI5iNyhMPzc10ov3tCDAkovrZGu/GhUHoPp3EvYDY29WJvMZntDS58bGdgqlOV0aHKQpVX953ckuIcYeGOU5qqSZ7zgOmf2UvVmdjv2sKSAWw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-ac34257295dso1116056566b.2; Tue, 15 Apr 2025 12:29:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744745358; x=1745350158; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dHWnoUY43/CNyBqqCrApGuqRk6IM6iTEIgL8pI3dxvk=; b=Xj89HvT1mt1gfbE5jYSx+rNMv/sfLB2EV3/sw3SarG/h19WAyBcfQ07oZpMZbBG2rW Wgk22dZHMN/BhX+1pq0dc65ezGZuOq9TNEfXvJXrPVF6OzipMBtOLIYkk38aqnXeTqAr ZGf1Y01Muemr6P+Ztdmzec2zTiu5akyW+JxxM9/I4NoTs/wcjq8Vs64Hofx4DcAstVGM 22j3+Y6doU+TqH1454GjHUyBCOR5fXBJ0AkoSWwvQMQQJH+BIrhvwnnUcD6UVbqp+NiT GN3Vu0OHumCdzBsD9K39Sv+Qe9tYN/VeDQQytYCYsZIRxhbfWOTeMtr22zlukM39sxqp RBPA== X-Forwarded-Encrypted: i=1; AJvYcCWsEPsyAvtDEVS6hm8NWbmJ68fBVtGR4jMxxO63cx81W57JDwjD3p8BUz+Ti0XyI+3wyTPvpJ9olAryhyg=@vger.kernel.org X-Gm-Message-State: AOJu0YwCbIxvyQiET+SICUMTMxHDr9bFjcPWUFvSpG73JCKNZPtRMIBP yEVpe44B8JiLaKwXXcFf7Kdb1222qDp8nrumaU7jHBBZE/DP3vgK X-Gm-Gg: ASbGnctZK2L0bYvpZpzFq2gXTaKpsKQOSb1qK55xLEIj6M2v4mGRLoV8CabNDMZtz3V Kfbdp4I0oG2T9o4SA2rcE3zVVu+7/Nhcxe+zfWtoGo0XqTxkns+GuVAse95sryxT9aUaAmcQdyw hpu89/SYgg02/ul9iO+er+6TQsJ1tjX2HrtKuGjIbPZXg8aYGwhssoXlcHd7EJuUUs7KYcOWZIL XpongQBhmPs6v0eFIlac/0r0ZeKihizlmDqn+Lm4ww/o8VPGolLB+YwyoUeM5eT4JydapjVt29s 0wEnMQAUA4qGIPaoVEi955m7PDCOtSA= X-Google-Smtp-Source: AGHT+IHXvSST23AOisF6PCSUFeiGo1ABusCZDQlLyzYOKYYSG+1TllTheL4d6IdTPg5SS20H31BbRA== X-Received: by 2002:a17:907:3d0a:b0:ac2:88df:6a5b with SMTP id a640c23a62f3a-acb384f2e24mr29995066b.42.1744745357779; Tue, 15 Apr 2025 12:29:17 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:5::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1cb40c0sm1161278966b.109.2025.04.15.12.29.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 12:29:17 -0700 (PDT) From: Breno Leitao Date: Tue, 15 Apr 2025 12:28:58 -0700 Subject: [PATCH net-next 7/8] ipv4: Use nlmsg_payload in ipmr file Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250415-nlmsg_v2-v1-7-a1c75d493fd7@debian.org> References: <20250415-nlmsg_v2-v1-0-a1c75d493fd7@debian.org> In-Reply-To: <20250415-nlmsg_v2-v1-0-a1c75d493fd7@debian.org> To: kuniyu@amazon.com, "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1784; i=leitao@debian.org; h=from:subject:message-id; bh=nxywYiBmzJG5ZGAgxVmCJ72hCLXBd9nxLm5C7qQo6Lo=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn/rOCtcfJVayR2TnwIdRVp8aA/WIa53eYQnHV2 73nHprv6OSJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/6zggAKCRA1o5Of/Hh3 bQavD/9Z7OEeGshFbdqTn9Kya/6/7eClmtdLOu/HK+QjhpHwRgAITExI8EGvQ2O1ehMMOOtikWe XXDJWtvu5x4yc6Vsll0xcDmRL3PvXYPJLW5eN4Y5YE+cEDGhac5adEPYDmD0ajk87LRfV2Z6jxu FVmynsTvTnsYDK14HjmAlZPBJ6rgFcdHtb4Fs2a4C/sRLy+FQq0bQZPdzfEMP5Ku3hckqpw/QC/ bCkAeg3K4yC58yhXWaklmYZ5XAML9UR3ZtFvPuTnyIH4U6bAlO1HLJ3CCCEBeFtqSG3cmXfnNjl j7vFVFpzTfuoSL9po04RGpPWaABc13DBfPTN0EHXlNJd8QGPSFfYBb6iYoUGMFqYtj78QVOh5B/ vzGP40HyAKG9IM8EsV+wQ4iGjGCkJBjnC7rGiDZV9jLNlbYx9xbfyUyRAdEDt0REjC0KtFGbOPy QPb490+wa89e/DlLSZbahKNd6vrqKrauIuo6kJ/Mf7o2TTBeAbddCYWAMjKeq3gPidoBRuLNgTp vya//PDjibtGghhEP5Fq7nvBYBu4bi+22T8j1PZMeCsG4nd9LqKgW33q0f5xk3x5lQTkztA7FzV +kZOcM77JoIAqb0K9amEI6kG06n1MMcUYrHeVOzISZy/XQ0OcJnHsRiVDEuocrOtsA3Hqg1ULHc fFiD82XR8PhRfDQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Patchwork-Delegate: kuba@kernel.org Leverage the new nlmsg_payload() helper to avoid checking for message size and then reading the nlmsg data. Signed-off-by: Breno Leitao Reviewed-by: Kuniyuki Iwashima --- net/ipv4/ipmr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index a8b04d4abcaae..3b5677d8467ef 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -2511,7 +2511,8 @@ static int ipmr_rtm_valid_getroute_req(struct sk_buff *skb, struct rtmsg *rtm; int i, err; - if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*rtm))) { + rtm = nlmsg_payload(nlh, sizeof(*rtm)); + if (!rtm) { NL_SET_ERR_MSG(extack, "ipv4: Invalid header for multicast route get request"); return -EINVAL; } @@ -2520,7 +2521,6 @@ static int ipmr_rtm_valid_getroute_req(struct sk_buff *skb, return nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX, rtm_ipv4_policy, extack); - rtm = nlmsg_data(nlh); if ((rtm->rtm_src_len && rtm->rtm_src_len != 32) || (rtm->rtm_dst_len && rtm->rtm_dst_len != 32) || rtm->rtm_tos || rtm->rtm_table || rtm->rtm_protocol || @@ -2836,7 +2836,8 @@ static int ipmr_valid_dumplink(const struct nlmsghdr *nlh, { struct ifinfomsg *ifm; - if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*ifm))) { + ifm = nlmsg_payload(nlh, sizeof(*ifm)); + if (!ifm) { NL_SET_ERR_MSG(extack, "ipv4: Invalid header for ipmr link dump"); return -EINVAL; } @@ -2846,7 +2847,6 @@ static int ipmr_valid_dumplink(const struct nlmsghdr *nlh, return -EINVAL; } - ifm = nlmsg_data(nlh); if (ifm->__ifi_pad || ifm->ifi_type || ifm->ifi_flags || ifm->ifi_change || ifm->ifi_index) { NL_SET_ERR_MSG(extack, "Invalid values in header for ipmr link dump request"); From patchwork Tue Apr 15 19:28:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 14052620 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0C88E2500AF; Tue, 15 Apr 2025 19:29:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744745362; cv=none; b=F7N6dR2eXe5LU30SU/vD3S0GMaE03CaOUz6r4n7cu2kQW/xYGY8rWlebPAQrn+m6ZRry7qSpXKXpkMsrb5mS9FJfju4oNHSQjJ8hYQ+NAG3vdyvhxnqkwSsDPmZ9NNmFUAV3NvWpqtebrRF6puUQjZD+Q8RD+5XqQeomEcpdEyY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744745362; c=relaxed/simple; bh=OgrBYJChauo/HPg7YP4x5vW5FU/rpTEOS7oljUwK8rM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pTkX0e9HEHNr3t63e/ZItYunAbWKVh37mPHu0gKAAzrvetUwziHhicCP5H9l3muPGBVwwnojW4rhmucR/tWsQN76QDAGOGyRqJCJXsErlc3Tc7A2cnY/yx9yC3LBfZgMjuWa9z8Q2StTwbvpSuekwvUJW/O57gPFnwL0Rwxl2bo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.218.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-aaecf50578eso1042725166b.2; Tue, 15 Apr 2025 12:29:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744745359; x=1745350159; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=i6hvu4BsV8Pf9sNrCipl1rnYTmbH/rxrZvF7/I/JnHw=; b=DJyYG55cFkx8/YGCBfj0xPCmVQkNqS6tB5cLqMtrSUJANrq0PzjTvbLdwYjX4OqXdT 0/RFViI6ktzQIPZLj04l+g5px6nHBbVTceIyaoTItPK6FpNT4fohswc8LVGy0AyPOIPO C2yCOk6bQy+rYVTeQ7iUEYVY8FprFzGfZXsGIbUDZ+sixFVjl86ih7el1lNWv5zxvTbx yIPCQQyZ0kO05v+Tah2HL5OyLOhtM0fXtyiP1yPYOCvEFd2Xd/MiF0cC1Nj6WPe31zCJ GVfksI1T+zCgLaqJgJcO8FNpIOxaBtzzrdSKLlfK07MAbIWueGk+HikWNC3nFW3bqH6d 8U4A== X-Forwarded-Encrypted: i=1; AJvYcCU54nYcG8kPSkA5PDL2QQ53/hTLEuOjPxkU9eW5pNjcO4Al/eJ5GJ9jiIZzwPsk61uq1YW9FrxctJE+bio=@vger.kernel.org X-Gm-Message-State: AOJu0YztHofTdmcqyCwIb3SLvXEZNpd6J75a9DP4YGjWFnpUDMZn9fZL 3zIzQzkPIJfogerlvWshV/JjsZz0fDzd6oZE/dk8cUUTj/qoq0z2 X-Gm-Gg: ASbGnctcJumICfshQScBnLsOeh+6bcP+ZQJt7Ji81RNboMymUNl3zJstiSpFvW+QFWx K7yPAbi+s7Qxk+b8qvsiY8gU82A9M04rPXpT4zC8y7kxvgJ4kOULIrHN3jDy8Fgs9y8+R7WklZH RQK2S914seLCs1KZbMex0h0uHlsXiPQbXZohtSdIrP8p8swft4sp3s7O84aiNuxXuxC5kmJAh9/ RC1beS1QE8SD8OQ4f3cf7qwsULHFu8YCFkWusf/QvEeojqBUWv7PH+m6dEqF3HCL26vsg8kAeZ+ L7cQ/IE3btTK5bLtaRy+eakmdPkORaFD X-Google-Smtp-Source: AGHT+IGVfUJY7W1XY/WBNr6AudkjRfbjJR9dZA+ebNVkkbGmeuRcsY/9F3AKwsFYN6oIvfdsXAxr9Q== X-Received: by 2002:a17:907:c807:b0:aca:c4a6:cd90 with SMTP id a640c23a62f3a-acb3818e421mr28861666b.5.1744745359175; Tue, 15 Apr 2025 12:29:19 -0700 (PDT) Received: from localhost ([2a03:2880:30ff:70::]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-acaa1ce732dsm1162393166b.171.2025.04.15.12.29.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Apr 2025 12:29:18 -0700 (PDT) From: Breno Leitao Date: Tue, 15 Apr 2025 12:28:59 -0700 Subject: [PATCH net-next 8/8] vxlan: Use nlmsg_payload in vxlan_vnifilter_dump Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250415-nlmsg_v2-v1-8-a1c75d493fd7@debian.org> References: <20250415-nlmsg_v2-v1-0-a1c75d493fd7@debian.org> In-Reply-To: <20250415-nlmsg_v2-v1-0-a1c75d493fd7@debian.org> To: kuniyu@amazon.com, "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Andrew Lunn Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Breno Leitao , kernel-team@meta.com X-Mailer: b4 0.15-dev-42535 X-Developer-Signature: v=1; a=openpgp-sha256; l=1066; i=leitao@debian.org; h=from:subject:message-id; bh=OgrBYJChauo/HPg7YP4x5vW5FU/rpTEOS7oljUwK8rM=; b=owEBbQKS/ZANAwAIATWjk5/8eHdtAcsmYgBn/rOCEUemxTQJ0FDQkWPxEA6SxvBxQkovRNSa7 cWLckBmgDSJAjMEAAEIAB0WIQSshTmm6PRnAspKQ5s1o5Of/Hh3bQUCZ/6zggAKCRA1o5Of/Hh3 bV3RD/47K97tUzXRHFT1jK072Q9PeGv4X/4956I8jmYt9tyzYwDRYiocnRf2zCWf4STa7o3OMSW C8hHVG6ZVDopKtD1qvbkYRseEjehPGKNOM0505K1oMZmLoqIRmRxWq8A3isvFibavBqSLtVe0Pp ACYIEWyKYbHJ8oYOjbfdgPXJpcGbraxjMjYt1eDFVCcwdIP4gJ4IUdJCQw68Lkihy7Wr7zjmu6s pq5SlvzEvWK0HVJWidovqDeE7ZajFVPftAdsLDNEn4c8Dw7hobgjq4IzYGdeEx4wnKT+U0bHpEO QkIS7/9xhwdqdTI0S2UJvTXUlX3Stigvk4Q7fxoisu/XPakV+dCL47P9SzTpi7eFpFYZHe9FLBV CUOsdq6chW6fm+8JnMZ8b99VG4xI+l+3fFWuWp8tRTI0mq/BrnqwaN4HmEirSx02gpdpmiBN407 hk6QMOKL3DW6QMzaYvx+S+6Vt7860dynu1afFOBjdFNAsAOmdJ1BRFE+2yYQ5l9TqOe0eGQCM3d esKZ2Sc5Jv049l+tK+IJgLufeICCfTsTb2oua9RVBL4aZuS0Cr4Wh4ZzcrwxanjDgyN1hJpgiBt faeB3T76cerrlBtUXFGrzZ2xf4ImFsccnUAnZKfpArdKwsMEKVdnCeIWwm+a4djnAWLGUd8o4LR NIZEwq7WCPGedVQ== X-Developer-Key: i=leitao@debian.org; a=openpgp; fpr=AC8539A6E8F46702CA4A439B35A3939FFC78776D X-Patchwork-Delegate: kuba@kernel.org Leverage the new nlmsg_payload() helper to avoid checking for message size and then reading the nlmsg data. Signed-off-by: Breno Leitao Reviewed-by: Kuniyuki Iwashima --- drivers/net/vxlan/vxlan_vnifilter.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/vxlan/vxlan_vnifilter.c b/drivers/net/vxlan/vxlan_vnifilter.c index 6e6e9f05509ab..d0753776d3394 100644 --- a/drivers/net/vxlan/vxlan_vnifilter.c +++ b/drivers/net/vxlan/vxlan_vnifilter.c @@ -411,13 +411,12 @@ static int vxlan_vnifilter_dump(struct sk_buff *skb, struct netlink_callback *cb struct tunnel_msg *tmsg; struct net_device *dev; - if (cb->nlh->nlmsg_len < nlmsg_msg_size(sizeof(struct tunnel_msg))) { + tmsg = nlmsg_payload(cb->nlh, sizeof(*tmsg)); + if (!tmsg) { NL_SET_ERR_MSG(cb->extack, "Invalid msg length"); return -EINVAL; } - tmsg = nlmsg_data(cb->nlh); - if (tmsg->flags & ~TUNNEL_MSG_VALID_USER_FLAGS) { NL_SET_ERR_MSG(cb->extack, "Invalid tunnelmsg flags in ancillary header"); return -EINVAL;