From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-180.mta1.migadu.com (out-180.mta1.migadu.com [95.215.58.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4631A35E549 for ; Thu, 28 May 2026 22:20:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.180 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780006858; cv=none; b=Upjq67FARfkeAhaiMVum9Y9b8LjPBLizQVXYmWwXHEjgVr49c7+j6+RnEVFB9kDENOS0o0MpVQ5aZuexpC3xc40sGZbrnSljwFkJCvhsXLbdV4NN3GxYxBL/av2FHCFer+aA7GXxgfHxW7xyqkbNQ0abIZ2A9NeXAGpllqKrzGM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780006858; c=relaxed/simple; bh=cVfpuWgsq2ZfaJ8+deeWRwLkA7RF4c0bRWku1w2ub2w=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=bcTbJl2ZVH7+Eh0ZNwPxoJOaaDJaX2N4RcKuacjEOE+AnIFMr/tCEgWNKD5/weG8KLbmOEJuMal4pbZwD3+5e+7+PRkZnr/Ez5FqOb2wEZhO/LXgtngtWZWcjGONkhYndSgqC2MZz/+hHma3cVjho4PEoE21B9NRN6vVhzlotUg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=LjJb+dUv; arc=none smtp.client-ip=95.215.58.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="LjJb+dUv" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1780006854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=wGVSmiz/gY2xjcrcLB1LkoCl2huToOXZUu1qh5UF84I=; b=LjJb+dUvQlGf1fSaE0nglcNXq18yuF1x7kEB0b53IJB6VlRZzJPBG43Rd/bTmrz9YNerS3 eEJLuZeKPIwpy/ZI5I6Ijb2SBYnZQA2Fu1lzfqi1hqOS/UIaJ8zlNiPDBJo3SVs38YQm6W GJ+INLe2GPcC5N567Cxh6yjrm6LZ0vU= From: Thorsten Blum To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Tim Bird , Thorsten Blum , Amir Goldstein , Christian Brauner Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next] net/dns_resolver: use kasprintf + kmemdup_nul to simplify dns_query Date: Fri, 29 May 2026 00:20:29 +0200 Message-ID: <20260528222030.1655010-2-thorsten.blum@linux.dev> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1601; i=thorsten.blum@linux.dev; h=from:subject; bh=cVfpuWgsq2ZfaJ8+deeWRwLkA7RF4c0bRWku1w2ub2w=; b=owGbwMvMwCUWt7pQ4caZUj3G02pJDFkS+9cVJS8rbQpMeyVsVWzgWDfv3Ael2IqbGQ8VU1WKb yQsn8rZUcrCIMbFICumyPJg1o8ZvqU1lZtMInbCzGFlAhnCwMUpABM5mszwv0BDQD6sOUNhl6oC d7vm/2D5YANNbw6/1U9POYbd4Psizsgwk5nl2p77AfN1HV6Lfs/Yt/jz1UKulZobV17eteyDUK8 bPwA= X-Developer-Key: i=thorsten.blum@linux.dev; a=openpgp; fpr=1D60735E8AEF3BE473B69D84733678FD8DFEEAD4 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT Use kasprintf() for descriptions with a query type and kmemdup_nul() otherwise to simplify dns_query(). Signed-off-by: Thorsten Blum --- net/dns_resolver/dns_query.c | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c index c250d82cad96..40c9acdb26cd 100644 --- a/net/dns_resolver/dns_query.c +++ b/net/dns_resolver/dns_query.c @@ -66,8 +66,7 @@ int dns_query(struct net *net, { struct key *rkey; struct user_key_payload *upayload; - size_t typelen, desclen; - char *desc, *cp; + char *desc; int ret, len; kenter("%s,%*.*s,%zu,%s", @@ -75,33 +74,17 @@ int dns_query(struct net *net, if (!name || namelen < 3 || namelen > 255) return -EINVAL; + if (type && *type == '\0') + return -EINVAL; /* construct the query key description as "[:]" */ - typelen = 0; - desclen = 0; - if (type) { - typelen = strlen(type); - if (typelen < 1) - return -EINVAL; - desclen += typelen + 1; - } - - desclen += namelen + 1; - - desc = kmalloc(desclen, GFP_KERNEL); + if (type) + desc = kasprintf(GFP_KERNEL, "%s:%.*s", type, (int)namelen, name); + else + desc = kmemdup_nul(name, namelen, GFP_KERNEL); if (!desc) return -ENOMEM; - cp = desc; - if (type) { - memcpy(cp, type, typelen); - cp += typelen; - *cp++ = ':'; - } - memcpy(cp, name, namelen); - cp += namelen; - *cp = '\0'; - if (!options) options = ""; kdebug("call request_key(,%s,%s)", desc, options);