From patchwork Thu Jan 24 05:16:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 1030278 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="cGJ9SPHn"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43lVkt004Cz9s4s for ; Thu, 24 Jan 2019 16:16:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726080AbfAXFQv (ORCPT ); Thu, 24 Jan 2019 00:16:51 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:44832 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725290AbfAXFQv (ORCPT ); Thu, 24 Jan 2019 00:16:51 -0500 Received: by mail-pl1-f196.google.com with SMTP id e11so2331336plt.11 for ; Wed, 23 Jan 2019 21:16:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=H6DSUS4RMXQpL7NLFxVdb5QN4IysEeC2v4r86I/A6q8=; b=cGJ9SPHnnVw5S7LhVmhRPq7DO8Ko0hh3QxWyYWotYet845WN/sya3vF3+y4lHqxhSD zmS0t8W9AMewN5OcdpkrqMxHo21e/Cs60NkcaVI5K6YZLkKseau49ZgSPCd+p+zvZAll eNdTNbpnFrtHe13HlaC3lAA9Rzj8lvya6a7e6jIhU6GJlYWBUZmDQnaKvI0YtK//j7E2 2JOkgsfj7N1OynHqhhe0MEe95danY7aQ7cirFR3mSYT3L9cvXoJk9Mlrnl3v3m3RxLH0 M6Jx89FFOo0rpG7LXKf/xlO38H+CIQos5+VS+VcEeLwNC17wBJlj+/XvB/fKMKz+cgXH Kzhw== 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; bh=H6DSUS4RMXQpL7NLFxVdb5QN4IysEeC2v4r86I/A6q8=; b=A7bv9jmCR8fw9Gbzce335nQ85S8KSfot2bJrlFVVPGNZBxsJLU79Btooa9OzFt0BwT Lce7GUzYTsAYjcjXJ/Hjnhd1X5qL28FL5mYk2syN460WUuJv9RAZhjia5wHFB31b6lFX QKE3BAslCQ+on/hiOJeidcs+kSA4RBR1OMJXMwbs1EFRx6hIK4rxhaQ4CFNKMzQXng4c IocZBkoorf3uiXTmeviCKz8+xlCXHguGoFfnNxIFGeeBDN7NTjZYkSF30O5/s9SnayBO rn1tuMoW5ichewZqktw5t0GU22o7HVQjKB3LJwMzy2ikCN45j5lugKcVJoJ1NL6hsq7o IqKQ== X-Gm-Message-State: AJcUukdt9J1ZDVngdKjzz3iyQnujDcniPatTcUIIB3jpz+VhvKfadATB SMxsjOmX9koMW6Tvf7g8LC8= X-Google-Smtp-Source: ALg8bN7fNZ9Pd2iUmBsk38ZYAj6OCRX99tKmBHiSiebkGZUB8np2JJhRZ7CMoWA1OBxXJsCkFxdgCQ== X-Received: by 2002:a17:902:12b:: with SMTP id 40mr5115576plb.72.1548307010927; Wed, 23 Jan 2019 21:16:50 -0800 (PST) Received: from localhost.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id d25sm28945515pfe.40.2019.01.23.21.16.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Jan 2019 21:16:50 -0800 (PST) From: Yafang Shao To: kafai@fb.com, brakmo@fb.com, ast@kernel.org, daniel@iogearbox.net Cc: netdev@vger.kernel.org, shaoyafang@didiglobal.com, Yafang Shao Subject: [PATCH v2 bpf-next] bpf: use the proper optlen when doing strncpy in bpf_getsockopt() Date: Thu, 24 Jan 2019 13:16:34 +0800 Message-Id: <1548306994-877-1-git-send-email-laoar.shao@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As strncpy(..., TCP_CA_NAME_MAX-1) is used in bpf_setsockopt(), this change will make it more consistent with the bpf_setsockopt() above. Acked-by: Martin KaFai Lau Acked-by: Lawrence Brakmo Signed-off-by: Yafang Shao --- net/core/filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/filter.c b/net/core/filter.c index 447dd1b..7a4de22 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -4262,7 +4262,7 @@ static unsigned long bpf_xdp_copy(void *dst_buff, const void *src_buff, if (!icsk->icsk_ca_ops || optlen <= 1) goto err_clear; - strncpy(optval, icsk->icsk_ca_ops->name, optlen); + strncpy(optval, icsk->icsk_ca_ops->name, optlen - 1); optval[optlen - 1] = 0; break; case TCP_SAVED_SYN: