From patchwork Fri Nov 20 09:07:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Abeni X-Patchwork-Id: 1403526 X-Patchwork-Delegate: matthieu.baerts@tessares.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=198.145.21.10; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=UlG8v/zQ; dkim-atps=neutral Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CcrKh0vDHz9sTc for ; Fri, 20 Nov 2020 20:07:36 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 87248100EC1F5; Fri, 20 Nov 2020 01:07:33 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=63.128.21.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=pabeni@redhat.com; receiver= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 57CF1100EF263 for ; Fri, 20 Nov 2020 01:07:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605863249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rjfbsQuzhA1ciB+zrDjj4kBOfE2qIFLkVVKnLpvzwtY=; b=UlG8v/zQxY0QDvbQJMgYQ/QbhkuygWHovbBc1wb7njVeaCmF+WgHUPwm3t4AeV9igMa1rg xXTZ0jlG2dCSXmC0aNXcorOSo1EWStHy27BBtQf8l5usKFEag+oSI1HWURNsEjvMfFO+dX qv4AbsPldEoa0l+wpZG8prCrwBds554= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-140-1g5jLDlRNbW3K0w99aw8KA-1; Fri, 20 Nov 2020 04:07:27 -0500 X-MC-Unique: 1g5jLDlRNbW3K0w99aw8KA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C2F128144EB for ; Fri, 20 Nov 2020 09:07:26 +0000 (UTC) Received: from gerbillo.redhat.com (ovpn-114-171.ams2.redhat.com [10.36.114.171]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3308812D7E for ; Fri, 20 Nov 2020 09:07:25 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.01.org Date: Fri, 20 Nov 2020 10:07:03 +0100 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: ZYAVZHGGE3YIZJRNECG4ERUKZD6SNFAJ X-Message-ID-Hash: ZYAVZHGGE3YIZJRNECG4ERUKZD6SNFAJ X-MailFrom: pabeni@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [PATCH net-next] Squash-to: "mptcp: use mptcp release_cb for delayed tasks" List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: fix uninitialized local variable usage. Signed-off-by: Paolo Abeni --- Side notes: - not sure why gcc did not complain here - if we will use the usual tags propagation schema will not credit the kernel test robot, on the flip side, I'm not sure if a: Co-developed-by: kernel test robot tag is what we want ;) --- net/mptcp/protocol.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index c42f92764ec9..69441ea71411 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1488,7 +1488,6 @@ static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk) struct mptcp_sendmsg_info info; struct mptcp_data_frag *dfrag; int len, copied = 0; - u32 sndbuf; info.flags = 0; while ((dfrag = mptcp_send_head(sk))) { @@ -1500,8 +1499,8 @@ static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk) /* do auto tuning */ if (!(sk->sk_userlocks & SOCK_SNDBUF_LOCK) && - sndbuf > READ_ONCE(sk->sk_sndbuf)) - WRITE_ONCE(sk->sk_sndbuf, sndbuf); + ssk->sk_sndbuf > READ_ONCE(sk->sk_sndbuf)) + WRITE_ONCE(sk->sk_sndbuf, ssk->sk_sndbuf); if (unlikely(mptcp_must_reclaim_memory(sk, ssk))) { __mptcp_update_wmem(sk);