From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f180.google.com (mail-qk1-f180.google.com [209.85.222.180]) (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 C146D37A853 for ; Sat, 11 Jul 2026 15:19:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783783185; cv=none; b=fyv5aSib8qrWgrt4t/dP/nLBmaE4y0t135MC8hTepaVe+/AE2n2LKfei//kFvQFBG4EBF5nyoMcRc2Uom4OpZ25SnLm8nxVpsi6IL/7KubTmjolt8DQlfAIxPvc9XDzUX7dPYW0kJ/O2azrwjjPvqaCpnFjr1HkWSmJolCyryww= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783783185; c=relaxed/simple; bh=LQIM3sBGvUqM9efCOb/AIjOUmu6tNvZEUwHUeE2z90I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BhN7HcoBPAahu6VDePy5kJ+GuPx8GwgPJyuZMd92pRSf9CaWdsEpGw54tdnxciLcq0qBslpS0BBNwBcCUuyUwSb41EGSTtE3MyouMGVMRUoco1z5wSUoH/MqeOPYq3lYo7qDORvDDZnvP/JLMkiS8vHKIy9YgskK7CXDosTQEY0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dsyq3Cga; arc=none smtp.client-ip=209.85.222.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dsyq3Cga" Received: by mail-qk1-f180.google.com with SMTP id af79cd13be357-92e5d6f35c1so151030785a.0 for ; Sat, 11 Jul 2026 08:19:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783783183; x=1784387983; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=BG2xjmjBbV5AQK/a/AQpxcpCL6NEh8yOHX50gnWQjos=; b=dsyq3Cga9QBG6oV17iVpysC04tH+/KvLCcOnz45NsPkoGMV3inV3L7FVledU/uxZ1N rtphRWj8QFYGGxfAbk0WPd3i4kNb0NDXrfgx/eFjw7qCBEJiQ1YlaVFd158Omn+3j6ep KDmnGPFpUjqw2tLCCzJ/ZgMgs/trhxYIFuWfvR8+K9QC6327iHNGGoCXX/o/SCIwIJzm Dj8gNLRrXkQwmnqfsYefBayJLzK3HfzMH07z8o/HHmUu9MImyZJd4edfOBdklNXkbgSs AyrzPp3LKEqlqfCD3zC7wc6oODaVsoOBq6ZV1eI5m0K0Da2RcSwVtTuKf3BMvsNA4iQx keEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783783183; x=1784387983; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=BG2xjmjBbV5AQK/a/AQpxcpCL6NEh8yOHX50gnWQjos=; b=lbq6dsIMZbzr2kTVU/r57W+AiSZXNy7fNi5I9/81eIIZlq4yAtWUam6bSN8UXD6tnM Z7TahWzXWzi0fDC0Tug42+K3ynoUb9px1p5KN5m0nG+usa+dvVbvvYF/ot0TerpHYgkq cMQ4OEpw3uA5+0p1Q1shuJmTzQaa/LaCMaS0rm2XX7SzZFIEC29R46KbdmrccukWkrEZ KkIFnm4gB3yZhPC9oBrhqTl6xzdJketMQO692lRrnP8P0kgAPnn+sZr+yXvwrkedty6V Yxh11l2/aAgqlN+sFtmpSdrt2oZqPjpWyd54oPyZXi3cuu+ct/1yylhmYz5YdlTTYEQI NHew== X-Forwarded-Encrypted: i=1; AHgh+RpMwH0vuX9DgJYDHW47X8ckVdaoPFnr3bdW7YMsy5VMBhzazVqmPZ70bOXXNABmLNbYYVaPVQp8oxmArxM=@vger.kernel.org X-Gm-Message-State: AOJu0YwVSRMw3hE5eLzcysDdS55nV6fWHedaiUz0bQFriC7oTb8qlZDN R5SIrrKuDPTxSFJfJw0UtlJeo4OJu5v0VwdxKSeNOp2bMxw8sZ/mhlWp X-Gm-Gg: AfdE7clS6Gh3ssjtlOwn/SOCAU7f2WoQeDX0TqYa1rweY2Mellz3664N5a7Fqkwhvjr JDVbUh3dPqiQ5rC4oWg4ocGq+CAE5y9I+IgOWc72Wr1MX/zDIxT6loqa8I57793sPz0PrFCQYeN mydprciL6AW6wGHDH2c6oek8uHGrV4l7bSLYhPvjX2xTIZfG+J0GrWlYMS/4edTaIz/4iViQHZr FfOrvjvTfJUhtUX2VbEOQJ6LH85vfmfEbbDjNnVgLHuzYESbBuZ+GMXexO7dqpZbvisAr6bQyWG deQixIvS+zf+NXwRdUGHoS0IEuuDnS3t5oNZFdKY4KOhl/Gr5uOCDgfxLNMXZSW1Y1US+4ZD0ey 4gwuilr2N0y0/lIyEOgsD8iw8LqXKfBE5mMkqsQ6de1GPF/skG1W5yCwRkl7muA5o3le+r6fiTD 1bBpv2dxwK2fEFj3a4k9W3XWzCqcuqonsxjt3Zf/MVDGN73eFFfHJ6oIUNpIwr2vtotoi9SYD1n v+BaVRjHQ== X-Received: by 2002:a05:620a:2995:b0:92e:c118:18b8 with SMTP id af79cd13be357-92ef2d01681mr351641285a.87.1783783182650; Sat, 11 Jul 2026 08:19:42 -0700 (PDT) Received: from server0 (c-68-48-65-54.hsd1.mi.comcast.net. [68.48.65.54]) by smtp.gmail.com with ESMTPSA id af79cd13be357-92ee5b4a082sm467704685a.7.2026.07.11.08.19.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Jul 2026 08:19:41 -0700 (PDT) From: Michael Bommarito To: Taehee Yoo , Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net v5 2/2] amt: make the head writable before rewriting the L2 header Date: Sat, 11 Jul 2026 11:19:34 -0400 Message-ID: <20260711151934.2955226-3-michael.bommarito@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260711151934.2955226-1-michael.bommarito@gmail.com> References: <20260711151934.2955226-1-michael.bommarito@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 7bit amt_multicast_data_handler(), amt_membership_query_handler() and amt_update_handler() rewrite the ethernet header of the decapsulated skb in place (eth->h_proto, eth->h_dest and, for the query, also eth->h_source) before handing it up the stack. The skb head may be shared, for example when a packet tap has cloned it on the underlay interface, so writing through it corrupts the other reader's copy. Call skb_cow_head() before the rewrite so the head is private. It is placed before the pointers into the head are (re-)derived, so a reallocation caused by the copy is picked up by those derivations. Fixes: cbc21dc1cfe9 ("amt: add data plane of amt interface") Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Michael Bommarito --- drivers/net/amt.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/amt.c b/drivers/net/amt.c index 35e77af76bd9d..b733309b866ff 100644 --- a/drivers/net/amt.c +++ b/drivers/net/amt.c @@ -2320,6 +2320,9 @@ static bool amt_multicast_data_handler(struct amt_dev *amt, struct sk_buff *skb) skb_reset_mac_header(skb); skb_pull(skb, sizeof(*eth)); + if (skb_cow_head(skb, 0)) + return true; + if (!pskb_may_pull(skb, sizeof(*iph))) return true; iph = ip_hdr(skb); @@ -2396,6 +2399,8 @@ static bool amt_membership_query_handler(struct amt_dev *amt, skb_reset_network_header(skb); eth = eth_hdr(skb); ether_addr_copy(h_source, oeth->h_source); + if (skb_cow_head(skb, 0)) + return true; if (!pskb_may_pull(skb, sizeof(*iph))) return true; @@ -2521,6 +2526,9 @@ static bool amt_update_handler(struct amt_dev *amt, struct sk_buff *skb) if (!pskb_may_pull(skb, sizeof(*iph))) return true; + if (skb_cow_head(skb, 0)) + return true; + iph = ip_hdr(skb); if (iph->version == 4) { if (ip_mc_check_igmp(skb)) { -- 2.53.0