From patchwork Mon Mar 4 08:20:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13580164 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 8869817564; Mon, 4 Mar 2024 08:20:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540457; cv=none; b=fAuu46f2YUo5Dkp5ytB4rhyufUijsttijP8rqDqkz694a/UfBPV8t2CEsbuvRKKOd9iFZqPGxgfytXS2MTXyDrQ9wctmguEgqtqud2/UEr7n1T0gpTk6Pw432GZm+lqM3vHNwNLSSS3q5KfyTRetMKAmqDgf56MoibWfkIHmZRQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540457; c=relaxed/simple; bh=F8F0TNbjm61Kg/mo1fXaFeoAP+njBf1JFYUjUJV3wH4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iKAqUzfMXolm3Q/H0E+UeZComGURTsbqcx5cdO6JRBU93Jqnixg7C8hFsHRd45YNm1lk2TlJatcPHbry0R3pxtrxVve8c+7Qejrem42iS4h898iqhxio0YMW1q0k6NSlmgvY79wQ2jrd8/wK3NtbOmYPmzauDp/qxwFk44guiEQ= 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=GgyeIaHM; arc=none smtp.client-ip=209.85.214.173 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="GgyeIaHM" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1dba177c596so25196855ad.0; Mon, 04 Mar 2024 00:20:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709540456; x=1710145256; 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; bh=CuFw7zdJ4b05azmCJ+puSRWM+FoHDlewGP+8VQ0QSgo=; b=GgyeIaHM7JLb5pMRdK8ONKaEeQRAjrZ/nZjk9quqzSvcQlyQt/rtzpsLv2R5+Dt2bH u3rnxjeuHdEXSDoLm/VEOqZXQkr1+WPg3vE+447a0vwyziF1IFJMLSVwziRVOwZxndHx bq2g+qfTfvZfWdzpYboJP/ykE1Jkeu/VDL+OvSMHNp7H9BD74KFHzLa4XJkMv9lFcvO8 +cCoQl/IXFO+9NMhBKVha2VEUtwmxLsjI6EPvmw7spM12hoD6l5tTaftx1JuDvcu7Q6l 3O7Y0uqtB+ir4MkY7LCnsEwODB1JFOmLbngwDn2sS9BUHQlv93hW0qxOoWs5q1d+upYm wz6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709540456; x=1710145256; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CuFw7zdJ4b05azmCJ+puSRWM+FoHDlewGP+8VQ0QSgo=; b=K4Swk5b9JIU5o1Vx9D7dCnm+1hPVr9pnMu/5urwG2aojLow9QvqUxB5VHgydHEkUl5 bjXW3rFIe4pAatmiz7KM2tfnWMqHCAWxgAcpwlgHh6UGEC+AWGm4HG8xLR7O/DwaqrGe TQyXitGofF7GM/NKUbS6v5R4Sqccpy/ke18AgUyNq/hSBc2hj3AkJEGVX9Dd3jDYhVbQ 2FQASW90/wwrf8KGm/yXX1+WFiGACpVoNtU7TYgv5kWPSJ2hfbVp3T5VU0vKbcLtlTRk KdsfdSGkTS5r2l8DoWG9l+NvTlViOA4ogJUVPR/46NTm15fBcY0KQKTEkTOoBFnxH86x bJtw== X-Forwarded-Encrypted: i=1; AJvYcCXBlLtpILDpPEYOBY7C0NmurjxMCheqhGpRN/cEXWExIIPQX9jTmxE9DSWkxHPD0yr3BmCizvt1bc/vXB0axn9HEV6ipEoA X-Gm-Message-State: AOJu0YzoAGIK5TRDm6mcce8RnKBOMg9tFBCYYQeBgB1Rm6A/R20sOfPY NMYqtAt8XLAAWvbcDhIBWKoBwXvh+zIp/xsrcNFLOfv+AFb/vQBr X-Google-Smtp-Source: AGHT+IFKzxmU5oFjpgAEoD174UxvB1VOv8JxZ0F2EBvWYlFV1bKpAuCvdVRafbskSlh+CBiVEkNRQA== X-Received: by 2002:a17:903:32cd:b0:1dc:fefe:8050 with SMTP id i13-20020a17090332cd00b001dcfefe8050mr6195208plr.29.1709540455908; Mon, 04 Mar 2024 00:20:55 -0800 (PST) Received: from KERNELXING-MB0.tencent.com ([43.132.141.21]) by smtp.gmail.com with ESMTPSA id j12-20020a170902c3cc00b001dca9a6fdf1sm7897014plj.183.2024.03.04.00.20.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 00:20:55 -0800 (PST) From: Jason Xing To: ralf@linux-mips.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: linux-hams@vger.kernel.org, netdev@vger.kernel.org, kerneljasonxing@gmail.com, Jason Xing Subject: [PATCH net 01/12] netrom: Fix a data-race around sysctl_netrom_default_path_quality Date: Mon, 4 Mar 2024 16:20:35 +0800 Message-Id: <20240304082046.64977-2-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240304082046.64977-1-kerneljasonxing@gmail.com> References: <20240304082046.64977-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Jason Xing We need to protect the reader reading sysctl_netrom_default_path_quality because the value can be changed concurrently. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Jason Xing --- net/netrom/nr_route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netrom/nr_route.c b/net/netrom/nr_route.c index baea3cbd76ca..6f709fdffc11 100644 --- a/net/netrom/nr_route.c +++ b/net/netrom/nr_route.c @@ -153,7 +153,7 @@ static int __must_check nr_add_node(ax25_address *nr, const char *mnemonic, nr_neigh->digipeat = NULL; nr_neigh->ax25 = NULL; nr_neigh->dev = dev; - nr_neigh->quality = sysctl_netrom_default_path_quality; + nr_neigh->quality = READ_ONCE(sysctl_netrom_default_path_quality); nr_neigh->locked = 0; nr_neigh->count = 0; nr_neigh->number = nr_neigh_no++; From patchwork Mon Mar 4 08:20:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13580165 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 97C4C17BAA; Mon, 4 Mar 2024 08:20:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540461; cv=none; b=fS6CLiFe6yOAGWcfLB3WyYA6+YiEL3nRAWoSJ2jcJuKdllFDG1IbQRdxmFxovke2HQCc2XVe4kCWAWapPauZWA8PpXmasiDGsKz3q1l/fczL6QlIODG1871P6/JOz8zJ5JvP7VBGeQDNMUORd/21qQSQxF2jYEWyi0g/1ziPtd0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540461; c=relaxed/simple; bh=Yilq/5StzUQjxtSsE3Qq/Xcxvpi4u8nblR2Z8I4D3FI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uzSBNpNgc9LWFP6JO/ace3yiMdCAzZTOmWhxUESI/yi9qrU0lYT09YlcB9Navn/YEgEf1DDvV9JEHzGI4H6SKAX2/2jrXCqCarkomxntbilbnYpHiTUyeiwpS89xPaY/CUov8zv4iEwqoXJ36dBdginMZ+jQcuGldvfY9FY3Wxo= 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=k9a2pRG1; arc=none smtp.client-ip=209.85.214.174 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="k9a2pRG1" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1dd10a37d68so5692145ad.2; Mon, 04 Mar 2024 00:20:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709540459; x=1710145259; 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; bh=StGUTai5dIRRT+0qVxAdaBRPjNSg44RktIyFonGdUKg=; b=k9a2pRG1uXIdVKwNSzk5RP69JhPGpwBIBN49NzSInJqH5B6PMhDtni39/ol4cbq1Cy hCBcPebxgQKweD+XiwUbHgyWdFIwCJy+IXeiF2wWmkpkYRsXBLTCPkDzp5RX/qz2Uwbu DY+H4mR0ynfQmlxdiw4F2FZMZEkBmyu/wMY9oaRFD/YguQ/BfN0Eh2ZG5oJMnM6kUKNd xHy2bj803oeClMQEtpeAqVTrOyTj9WoofpeG58jCiowyzZuJ6lBLt1tBcQqINtx4+4gq BNAOFxUnHK9zOlWT27BF4iGL4FhbiJXqb/r9cuIm7bw8aIjTUUlKVB2tC6tHIIhjKBXP +XGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709540459; x=1710145259; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=StGUTai5dIRRT+0qVxAdaBRPjNSg44RktIyFonGdUKg=; b=CQ5hvl6vT++YELidPuQip9OHFDfxcrMLokU8moZm5cqJbNS2aDHt7Ja8KXjrLXWZxs Jc8FqjO+77XFTrIztDtlgNaF8g6dGx7sRuHeVpk4DBGaZNjKeEbf0MLGGu3aQcmGt+oa rfVtL9asQg6jeYIj3BpqF3jUa9n1endp99mKIUXQ1YdaCjURHnxR110j3Qi6uvcj6G04 UsiDN0ZjEpH1RQ2xvmjT2UJIv2pf2LJJGVdwBzUOsyFCy0B8T34CnsveGcRE33K+RSPk pOxSk/91kIZYnb0dAkSqutslvIPzuO40jeo24g5YddLcnIrjauJ4K2lATpUCxqYnN9DK zJpg== X-Forwarded-Encrypted: i=1; AJvYcCXE4O110DJY4jKPDUyAUMga4QXyXF4WIdonXEUueqx36BewetKflNK6T+vQXzo77uHVvTxESsty+H0zCw5mkId5BM2dexuE X-Gm-Message-State: AOJu0YxkQp60ZC8t1d1jVdB9DAwLql3/RIwGJfLoOU//RX8o8DLIyKHS XBGjf2KP6pmizIjRa+/At/DoQJJ6AYD450IE0z2LR38a0cHt90Rj X-Google-Smtp-Source: AGHT+IF/MlFW4zyS5ikC9w+UgVIiV8l1OES15WhBPt6ffjlAe52+ReAYcE08X5e4Ib7jf7aWsTINbw== X-Received: by 2002:a17:902:ee84:b0:1dc:499b:8e80 with SMTP id a4-20020a170902ee8400b001dc499b8e80mr7168199pld.54.1709540458833; Mon, 04 Mar 2024 00:20:58 -0800 (PST) Received: from KERNELXING-MB0.tencent.com ([43.132.141.21]) by smtp.gmail.com with ESMTPSA id j12-20020a170902c3cc00b001dca9a6fdf1sm7897014plj.183.2024.03.04.00.20.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 00:20:58 -0800 (PST) From: Jason Xing To: ralf@linux-mips.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: linux-hams@vger.kernel.org, netdev@vger.kernel.org, kerneljasonxing@gmail.com, Jason Xing Subject: [PATCH net 02/12] netrom: Fix a data-race around sysctl_netrom_obsolescence_count_initialiser Date: Mon, 4 Mar 2024 16:20:36 +0800 Message-Id: <20240304082046.64977-3-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240304082046.64977-1-kerneljasonxing@gmail.com> References: <20240304082046.64977-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Jason Xing We need to protect the reader reading the sysctl value because the value can be changed concurrently. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Jason Xing --- net/netrom/nr_route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netrom/nr_route.c b/net/netrom/nr_route.c index 6f709fdffc11..b8ddd8048f35 100644 --- a/net/netrom/nr_route.c +++ b/net/netrom/nr_route.c @@ -766,7 +766,7 @@ int nr_route_frame(struct sk_buff *skb, ax25_cb *ax25) if (ax25 != NULL) { ret = nr_add_node(nr_src, "", &ax25->dest_addr, ax25->digipeat, ax25->ax25_dev->dev, 0, - sysctl_netrom_obsolescence_count_initialiser); + READ_ONCE(sysctl_netrom_obsolescence_count_initialiser)); if (ret) return ret; } From patchwork Mon Mar 4 08:20:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13580166 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 5573A17BAA; Mon, 4 Mar 2024 08:21:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540463; cv=none; b=nonVnliVJDH38NjhhqQHdqQCoXampaGPk9OejPgYYaditxrEd+VDqATpv7oXnxuPp6qffEEOm/XKj/A/uSqrBTNkGz3kHCXOovUtW+pvI3b2QkfeO7aKyo8voukIswhFLAmv0H/aijOSfIcD/VjfN7frftC7q7edpxJJ1DaGfl8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540463; c=relaxed/simple; bh=y79GMOvWd5dG5z4S7JT6/RcTTwuryF+k3/tAnoHoEUg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lOjtDzGvW77FBlRjjqorh3pyOww00A0L2H9/GY1kr9zNcux+gHZKz1xxm2VMqFMyKYN6nBLgaO5K4OMUQw5KkW72g/s4Ux5MjJkqaD03FHtltUVUDoWUouWErrY7RgOsTz2/rW67Bik3JwJetfiyyxe5SjWgEkysDcYZHvZbxps= 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=eRKehy+k; arc=none smtp.client-ip=209.85.214.178 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="eRKehy+k" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1dc13fb0133so30443465ad.3; Mon, 04 Mar 2024 00:21:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709540462; x=1710145262; 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; bh=E3bAu00DzxRZdy1Mz0sP7/AqGlwRNs6txE5fz4BNJO8=; b=eRKehy+kGTmYB0m6szOc/zme6ThEDq2KGYORntsOk5wzEwe1f/nMeRtNOaMr5iAWXB XIKYmh9HPINGjvFK1sm04eCgdeZAFQDFrkIkufSiuA0Ml1hc/XrjjMvcfonQ6hpn9txe 5jMKnjlKQV2gCpYf4jnWHHgkICokYP2RXR9JJnQYvgYXnj8/l6cYjVQTPoD/YnSbOGCB AN/k1BtL0gKRz+tTvtYfsTj/FONc7RHYeH2qPXYiw+Hds3YoBQjdttFZ50tt/bBXsFah qL4M9KS6bS2Hmib9mjk++us8FLRfPW0PnzMqQ/B0d/SSeqUNfTRBpCSfNL9su47N1D49 vgIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709540462; x=1710145262; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E3bAu00DzxRZdy1Mz0sP7/AqGlwRNs6txE5fz4BNJO8=; b=i+RD9DnqYswz4imFgXjDZ4qQ5wLmbvnZ7Uvy26jp/GwAtj2AQFRIim81/dnSQ9ZdTk muW2NlvXDsceR6cJBv5t2AMP5m8Ta5IFA7vjtjCnG4E6L8Yeo663r05kzIeWuB+3comr XWDTrGqY5aeb5Z0fJV634kfoLQlynmBwFiSaIt60e1g8Jkn3hlJQr3V1GkDKmqv4GEzL 3JbH5mY0rk8kSSsVn17WWQ+JMgTp7baCVys4a+qWM6F2iVOBd+x7mBSGcDysCMO5Fiz9 WQASg+PgJWp9ml08Pq7CkKtngVf5lyJXarV/7N3/cspLohcwmF3x7nnqp8FIczp6M0N8 xeXg== X-Forwarded-Encrypted: i=1; AJvYcCVrI+FHDtIV85P2gr8Ucx5zG/7F0LPi/tU2dj4QlQNQy0rlgFDP4x4hCVIvWoWpRkZtQDEP2IH6sKBvaCXrP27HmLarNLJF X-Gm-Message-State: AOJu0YwtMVnacPiPOuzKwRVAAnHjHRJL80myuaTPffWrioJQBxwLPZtl 7N0ERpuJEmBKjE70jB3wFOt1C/W11QgRkFcZzNA3ViQuxmXQnLoZ X-Google-Smtp-Source: AGHT+IF6e1awzNWXTqWZ4QCQfMy5l1/fOZUh/I+o/lbIr+FIr95XcFM0HMIRJdFcR6UQgtX/MK9bCQ== X-Received: by 2002:a17:902:cf0a:b0:1dc:a84c:987c with SMTP id i10-20020a170902cf0a00b001dca84c987cmr8676423plg.10.1709540461706; Mon, 04 Mar 2024 00:21:01 -0800 (PST) Received: from KERNELXING-MB0.tencent.com ([43.132.141.21]) by smtp.gmail.com with ESMTPSA id j12-20020a170902c3cc00b001dca9a6fdf1sm7897014plj.183.2024.03.04.00.20.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 00:21:01 -0800 (PST) From: Jason Xing To: ralf@linux-mips.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: linux-hams@vger.kernel.org, netdev@vger.kernel.org, kerneljasonxing@gmail.com, Jason Xing Subject: [PATCH net 03/12] netrom: Fix data-races around sysctl_netrom_network_ttl_initialiser Date: Mon, 4 Mar 2024 16:20:37 +0800 Message-Id: <20240304082046.64977-4-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240304082046.64977-1-kerneljasonxing@gmail.com> References: <20240304082046.64977-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Jason Xing We need to protect the reader reading the sysctl value because the value can be changed concurrently. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Jason Xing --- net/netrom/nr_dev.c | 2 +- net/netrom/nr_out.c | 2 +- net/netrom/nr_subr.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c index 3aaac4a22b38..2c34389c3ce6 100644 --- a/net/netrom/nr_dev.c +++ b/net/netrom/nr_dev.c @@ -81,7 +81,7 @@ static int nr_header(struct sk_buff *skb, struct net_device *dev, buff[6] |= AX25_SSSID_SPARE; buff += AX25_ADDR_LEN; - *buff++ = sysctl_netrom_network_ttl_initialiser; + *buff++ = READ_ONCE(sysctl_netrom_network_ttl_initialiser); *buff++ = NR_PROTO_IP; *buff++ = NR_PROTO_IP; diff --git a/net/netrom/nr_out.c b/net/netrom/nr_out.c index 44929657f5b7..5e531394a724 100644 --- a/net/netrom/nr_out.c +++ b/net/netrom/nr_out.c @@ -204,7 +204,7 @@ void nr_transmit_buffer(struct sock *sk, struct sk_buff *skb) dptr[6] |= AX25_SSSID_SPARE; dptr += AX25_ADDR_LEN; - *dptr++ = sysctl_netrom_network_ttl_initialiser; + *dptr++ = READ_ONCE(sysctl_netrom_network_ttl_initialiser); if (!nr_route_frame(skb, NULL)) { kfree_skb(skb); diff --git a/net/netrom/nr_subr.c b/net/netrom/nr_subr.c index e2d2af924cff..c3bbd5880850 100644 --- a/net/netrom/nr_subr.c +++ b/net/netrom/nr_subr.c @@ -182,7 +182,8 @@ void nr_write_internal(struct sock *sk, int frametype) *dptr++ = nr->my_id; *dptr++ = frametype; *dptr++ = nr->window; - if (nr->bpqext) *dptr++ = sysctl_netrom_network_ttl_initialiser; + if (nr->bpqext) + *dptr++ = READ_ONCE(sysctl_netrom_network_ttl_initialiser); break; case NR_DISCREQ: @@ -236,7 +237,7 @@ void __nr_transmit_reply(struct sk_buff *skb, int mine, unsigned char cmdflags) dptr[6] |= AX25_SSSID_SPARE; dptr += AX25_ADDR_LEN; - *dptr++ = sysctl_netrom_network_ttl_initialiser; + *dptr++ = READ_ONCE(sysctl_netrom_network_ttl_initialiser); if (mine) { *dptr++ = 0; From patchwork Mon Mar 4 08:20:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13580167 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) (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 5B27A17C70; Mon, 4 Mar 2024 08:21:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540466; cv=none; b=OQlKScvWo4TG8400jl9XmesFzXLy/5/lJIeG1d93NdUla4B6snjVVLQyviCKrEuuhD1I4wAObNZmAclzocQ2Ij+cuF6/rdeQf1g+xkuAeE6qkdshxEWxnegpfILd6Gkd1OQeCA1uqt5CXhXXA5CdQGUKidahidaNbXAQFToy4sQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540466; c=relaxed/simple; bh=yhH2UYOqevAYlqYBGeKOJeeW9sSDT2htpvDl5fgO+7I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Y4ljK7TjBb3LIXsN/im2V3zn6a5iw28sOcVVtDiS9J6/6GgcQMzy95m1QoaxCyL6WLaTatEchyBes6VZSUOQyOk/zwoE91HiZW0cAUoD9gQsz3/cFPKfB0zl5OL0px8ssQbvcIAGbJM4/SAG7fZMv+DyvYejtyCTUPYcPcLI+9s= 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=Q12Fsfcg; arc=none smtp.client-ip=209.85.215.175 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="Q12Fsfcg" Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-5d8b70b39efso3832760a12.0; Mon, 04 Mar 2024 00:21:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709540464; x=1710145264; 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; bh=rQRxft7r3433IK//L+TED8XHsmqad6EmXJXus0LGyRk=; b=Q12FsfcgwHaBg3KetqNE28YWPz/xKohBnmxeUS29fJiFGoHqNOZiLBSSO/O3UBvT4j HduQGEFdckjvK2AXproLxZ08CkcsWwj2bt69pGXu948K8NO41800oiFWJVtzUb8kIMCb bHN3/J4KLal/dGWbYwKDHwMWq5NH/cDhT9QmLvla+1akj6O0ycgptxRz1NsJobUArSPT YbtKDCTS/XiKh5g3P9efrs2IF7wB7GKGlqjo/ne6POURoAefYDo6vp0eybXPuLTMYJp6 SnLa9BOVcGzbHjG76cncS9HIVQrV3f22ntrE+BzQIKJ3LBPjwAwM+UtSIBuicTz4ChLZ 9X/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709540464; x=1710145264; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rQRxft7r3433IK//L+TED8XHsmqad6EmXJXus0LGyRk=; b=Ij/uvYIYA9vTJM/vZftanzs1A5JBOUdWVpeBYYgW0tkHPRBaFIqgxH1wwFILoIS8tf naoJZOYWcmkUiRqVj2XGG04oGmEAbx0/J6viWNNmDFcq9Viwfn0jXZgUa9SwxKkM1sAo WY7k3I5RhWGzRCf2qRJnrS20YnLvU1JK2znnDsq8mO8hUAINF2utW5mV9ou8r7Rlx71L 7DEdtt1Q0JlLFBS9dLDAb+/CTEsGq7BE1tQrRA08jYXweM0qgaXeC+j63uP76q6vPXWv LkXbLwN8OOXotMNVu9n6Dwl0If2k5I1Z7AqoQGjS8m9A6GF05UCPPm11TP+5ZZBodeLI F0+A== X-Forwarded-Encrypted: i=1; AJvYcCWEJtMGpGIpC90vIAYK+Ag0eanCZfySK1M0BQc5zqg4090QViDzs44v+P33GBw03aq8Z8rLgOLyhDUH8abPoqa5GApMJ89d X-Gm-Message-State: AOJu0YxIzKzXrRvJdsvRfAtVUf8iJ5er3wB6WBmiaEtRgVWaaaeKKli/ zVug5i5EWgD4QEuumIF4on2HJwhoooyKTqmkXwaopHF+Vfe93nlw X-Google-Smtp-Source: AGHT+IEgWrkgtx7U78l40RJHwt9p387FijzCVTjb3SV5lPa1veeNljZzgAUpWsxze0KuY6X3XMDfVg== X-Received: by 2002:a05:6a20:1592:b0:19e:ac58:7b0d with SMTP id h18-20020a056a20159200b0019eac587b0dmr6108135pzj.5.1709540464595; Mon, 04 Mar 2024 00:21:04 -0800 (PST) Received: from KERNELXING-MB0.tencent.com ([43.132.141.21]) by smtp.gmail.com with ESMTPSA id j12-20020a170902c3cc00b001dca9a6fdf1sm7897014plj.183.2024.03.04.00.21.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 00:21:04 -0800 (PST) From: Jason Xing To: ralf@linux-mips.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: linux-hams@vger.kernel.org, netdev@vger.kernel.org, kerneljasonxing@gmail.com, Jason Xing Subject: [PATCH net 04/12] netrom: Fix a data-race around sysctl_netrom_transport_timeout Date: Mon, 4 Mar 2024 16:20:38 +0800 Message-Id: <20240304082046.64977-5-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240304082046.64977-1-kerneljasonxing@gmail.com> References: <20240304082046.64977-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Jason Xing We need to protect the reader reading the sysctl value because the value can be changed concurrently. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Jason Xing --- net/netrom/af_netrom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 0eed00184adf..4d0e0834d527 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -453,7 +453,7 @@ static int nr_create(struct net *net, struct socket *sock, int protocol, nr_init_timers(sk); nr->t1 = - msecs_to_jiffies(sysctl_netrom_transport_timeout); + msecs_to_jiffies(READ_ONCE(sysctl_netrom_transport_timeout)); nr->t2 = msecs_to_jiffies(sysctl_netrom_transport_acknowledge_delay); nr->n2 = From patchwork Mon Mar 4 08:20:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13580168 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (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 1F24517C7C; Mon, 4 Mar 2024 08:21:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540469; cv=none; b=M+93MNt7C25iT7cUOKmUilh5zZ+EfMRn96HZvtzAyhg7FqyJzObPcu/B7MjR7W4hh4HRjvyOqxA0BdUlzvEHNillyxta6ZR5LLh5KaKK/ZVrVUxXOpgyCvPkXVbf306YwPqlMYmEF0bzWrTJc/Yg4bCBEIObV27djpW/NT03BN0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540469; c=relaxed/simple; bh=5qOtxUQrFv/GEEKCyZFf6zEUcZ3cSCkMc0uuRo/5p/I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=X79TTBEczwaAAwOGTh+JSj7f3DsPG9sSNsrObt3FT8D6+P5UKq4d4g++sw8rCibeFY5muCGdw04Gpz4+WZDOIG4BBCIb6f631K6xR8+eqtI7xXiclMBNQpRmtf5gqpjTX1UZ88OwL1nfHo4hVnAVlHis3TiPgdvCW4C2Y/T/auY= 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=l5VHlbHT; arc=none smtp.client-ip=209.85.210.170 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="l5VHlbHT" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6e5eaf5bb3eso908630b3a.3; Mon, 04 Mar 2024 00:21:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709540467; x=1710145267; 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; bh=FdD+CaPse9U48RqBz2MFPEQAOQKv6p038r9WdaR0/O8=; b=l5VHlbHTRVlb7/BkCJoaYN9RI0xtVxC1vX0LjxlreltmLjZn71fXRGrlUsHBPOORpg ZVpOCv5tp0bgcAGkJH6ZYczE8QRHXjvd9EsBdAALucMtaLrW5H5+WXPHroftKbu65cu2 RpBRuFSjFyEql7zoOM/Saee9pL3r3SnU2uegIBPH2l4oNSFGEweCmJUJNIIdrJDTzkjJ wmzOPtp7ol2UfcQwLEkTILXpOQRChwomHUxXG/LZqDfWRRJ31hxvHlqufvSUQnhAW+kU iWLP+qRcoFEgSmICuTuGwy6JCz0wwJxMJSyoz1uKU4wbDg4SFf5+u+LxRHJIXbVhCWhf Zs5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709540467; x=1710145267; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FdD+CaPse9U48RqBz2MFPEQAOQKv6p038r9WdaR0/O8=; b=FUOD/2mH5R7Vqqgiz5cNw6GkkGPGJc3kvNBo8FxUtWKXtBL7132qSB9P6AhR3HX4zR PWYUXhyQGk94o2PSAvsFolcWauJvrTItBaUgSXzZIC/p6sx8WIML3gmWbvW6TTo2XDMo U8z10rWzVEoR6sdBHbqneCSBuMPQX4BVwLUIlj4ogL3F8Us3FXZObQdIsHBQDz4hlAS4 BfXqv0zKHwjZb350OuSDlGajClsv4yP0VgGPncq6IY6AABnOVuzJBm/UHpcSRK82vzUm LTifUOR6GiU3BUvkGfYLAQ0qVhS8JFTrU93BRN26xg4k0kLN1gJvT7gZnMaKn7cN3tlB qzcg== X-Forwarded-Encrypted: i=1; AJvYcCWwYZbzaBN5K78kw9HpiEH88z3AySHrqlbXOklC6/9VleAqAuApf7oUK2LwtZ0KsJxFYXP84+OBwvjCX/UvCJhkXUDUlaBC X-Gm-Message-State: AOJu0YyDMd2/cTRhjLn26cig/ohTvmkjMXYM7N7EP1CkjnqAR4HCxhCu R7/D4T4804xBaqhck02z4dcF+Vub1gPYQg2mhS3MDuXxEiEjHWNu X-Google-Smtp-Source: AGHT+IGLfqZqybedZwI/qfQg0Qh9bAlx4e7Z4uBwO+JkYdCQm49PrRJfPWZDz28/pM8oW5RJgKgflg== X-Received: by 2002:a05:6a21:3a94:b0:1a1:4ec4:a23c with SMTP id zv20-20020a056a213a9400b001a14ec4a23cmr248799pzb.44.1709540467485; Mon, 04 Mar 2024 00:21:07 -0800 (PST) Received: from KERNELXING-MB0.tencent.com ([43.132.141.21]) by smtp.gmail.com with ESMTPSA id j12-20020a170902c3cc00b001dca9a6fdf1sm7897014plj.183.2024.03.04.00.21.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 00:21:07 -0800 (PST) From: Jason Xing To: ralf@linux-mips.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: linux-hams@vger.kernel.org, netdev@vger.kernel.org, kerneljasonxing@gmail.com, Jason Xing Subject: [PATCH net 05/12] netrom: Fix a data-race around sysctl_netrom_transport_maximum_tries Date: Mon, 4 Mar 2024 16:20:39 +0800 Message-Id: <20240304082046.64977-6-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240304082046.64977-1-kerneljasonxing@gmail.com> References: <20240304082046.64977-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Jason Xing We need to protect the reader reading the sysctl value because the value can be changed concurrently. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Jason Xing --- net/netrom/af_netrom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 4d0e0834d527..312fc745db7f 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -457,7 +457,7 @@ static int nr_create(struct net *net, struct socket *sock, int protocol, nr->t2 = msecs_to_jiffies(sysctl_netrom_transport_acknowledge_delay); nr->n2 = - msecs_to_jiffies(sysctl_netrom_transport_maximum_tries); + msecs_to_jiffies(READ_ONCE(sysctl_netrom_transport_maximum_tries)); nr->t4 = msecs_to_jiffies(sysctl_netrom_transport_busy_delay); nr->idle = From patchwork Mon Mar 4 08:20:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13580169 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) (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 2711B17C7C; Mon, 4 Mar 2024 08:21:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540472; cv=none; b=ViqjtLfWeZqM63vVrHVnFmm0SVlv9VHq4bYj+yn9COgAkkgmzuzGRfZ9m+ZWcWBozhA7ntbgFebPuTYr06/TSZAuvWNaPyARyIVWkK+ROxnE9DXBhS1bS0nVbtuMatmcc+REV4P9EXMPJA595lbinNZ0xj9NxMA/LowueWfeNeY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540472; c=relaxed/simple; bh=IGxxE3ypF0VtVF/3Th0Ymtg/DaiKUhhyu2ipKBii5dY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WkvMVCjeFUTop/t6HKkjh4nRRjbV+dtljNgTpCLWhG8WNHfCxx6qUCP/Scn0UmXBuLZ6zraiLzsbUWwThCFLUZ5yLpOOJzzKRPhYfbT90XuyPYKRLWcBJ81+nwWXZ6DJ9wndEkF6YsK7vXLBG9agdQjjLz/GS2MS/TqMC0fVkCA= 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=kFxkm+3t; arc=none smtp.client-ip=209.85.215.171 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="kFxkm+3t" Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-5cedfc32250so3718387a12.0; Mon, 04 Mar 2024 00:21:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709540470; x=1710145270; 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; bh=RIzGPlimlb6nzP0aI2rUDv184DfL3j9hRA7WBnTQH+I=; b=kFxkm+3tbOIXVGa/53S8oszHHlilibrzViNquMVIg+MLx2E/js7KQ/UHdXL2G/SRR5 SMgp+/MQ3vAeEl6LjeY6pplRaP/3xFOhkJtZEZbwSSU/rRtpmiECnkuRCNP9rxoQvc/O PQs+YI4p5nvpWLkMCueLcz62I4eWJBNs2LellmJFSoygfEVfiiDlqBWSElEcIo2sxVhI azb2EfuNNryPq/ppBfYIYnj9x7JBtQh00zAeQIWiJPrY/UGeHuXQmHkLjVkZBuj3Obaf YZ0QYAIn25WL1AD+yN1SX9CcKFMBawlHF2FGfIV5ACaDPUEFTDM1WHR/U4sjN0YW/sSZ TEKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709540470; x=1710145270; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RIzGPlimlb6nzP0aI2rUDv184DfL3j9hRA7WBnTQH+I=; b=h8yzNgM5mOttVyW719UMSIXCAIbsNVy3Ma3RN7Zth+BOJ2+5EFq6A/9RkLQwnhKHFC +7yU9RkuYuji8Yr061ELsy36NJWMm0Ri7CsQ6RXyAeYhSjz9iIhNbP00rzTwjf6JoWK/ 54UEfnNnsSBZvjKl7fUqbGr0EDPvGEFxK2OZ2/i72mS/lN11v6c9SOKuPuWOxeR1M7ZX 2D6j1pOALq+9jVIhh+xuMekF+rFD5KeteQz6fVH+RuaU58x42IzI8QOJ4nSpxciQY1lZ eG4D2IHI26hmhaF+vknlPYOzpmTcZDF/Xf3ywIFLDaZDotIG4KnGoR16Fy2Vsx6aoXiZ L8PA== X-Forwarded-Encrypted: i=1; AJvYcCXHjFwwJfB0ufa0t7Ki3c9Cv/qggfPynLM4kwIjTV9gV07rIcongm/GnFlAIu/kB6AvupX4tt0Iu181Ye3K+Zwwwzmlgcqb X-Gm-Message-State: AOJu0YyFEONH4u83nmdeMYFUnUka65SqGbcjY2+zhaa+xqXtONkveu2K BqI+Ph+bvLj8+dsb0qYJRSOOjlniNlgK5ASOC46JkdnIbEH4N1fE X-Google-Smtp-Source: AGHT+IFiNR2y/AZf/PoirTngRArTzEi+dhMG4Sm88O2Tyz+filisFuDcK8FRsHPGocJIdX/tq5vH7Q== X-Received: by 2002:a05:6a20:6aa1:b0:1a1:2cba:baf2 with SMTP id bi33-20020a056a206aa100b001a12cbabaf2mr5104970pzb.52.1709540470398; Mon, 04 Mar 2024 00:21:10 -0800 (PST) Received: from KERNELXING-MB0.tencent.com ([43.132.141.21]) by smtp.gmail.com with ESMTPSA id j12-20020a170902c3cc00b001dca9a6fdf1sm7897014plj.183.2024.03.04.00.21.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 00:21:09 -0800 (PST) From: Jason Xing To: ralf@linux-mips.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: linux-hams@vger.kernel.org, netdev@vger.kernel.org, kerneljasonxing@gmail.com, Jason Xing Subject: [PATCH net 06/12] netrom: Fix a data-race around sysctl_netrom_transport_acknowledge_delay Date: Mon, 4 Mar 2024 16:20:40 +0800 Message-Id: <20240304082046.64977-7-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240304082046.64977-1-kerneljasonxing@gmail.com> References: <20240304082046.64977-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Jason Xing We need to protect the reader reading the sysctl value because the value can be changed concurrently. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Jason Xing --- net/netrom/af_netrom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 312fc745db7f..8ada0da3c0e0 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -455,7 +455,7 @@ static int nr_create(struct net *net, struct socket *sock, int protocol, nr->t1 = msecs_to_jiffies(READ_ONCE(sysctl_netrom_transport_timeout)); nr->t2 = - msecs_to_jiffies(sysctl_netrom_transport_acknowledge_delay); + msecs_to_jiffies(READ_ONCE(sysctl_netrom_transport_acknowledge_delay)); nr->n2 = msecs_to_jiffies(READ_ONCE(sysctl_netrom_transport_maximum_tries)); nr->t4 = From patchwork Mon Mar 4 08:20:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13580170 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 E617617C7C; Mon, 4 Mar 2024 08:21:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540475; cv=none; b=bgSxJ9WdKTBDTRvJLHdz/xYA+uhB1XkWu/p8VeKiTI6ASRy+nQnxL6zHQhU/OLFN8Dn2c+qh2zKu67uIgMT/jqwhY+XoTLb2dTcua9Z9tBe5B17Faue5YBIZimH6X6JKv9AeLJdYyASCVLLrTCdgzVGkt+5JJ+b/ohjs6bpV62s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540475; c=relaxed/simple; bh=smmLe5LH9LS1H6g/432kEPTnn2g/DCIn+/Eu/TKPPNM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Lqu8rXGztwp10lrv2lJusz4rRFIhxhgEU3WghsSE/We9KCjFCipHB9r5mFrRCBCk1pd+P/KOr8CbJHFtjX1fEARSsZI/FVOtUvT1ublEk2Tg1sN4fnsPSIz0NOcUVQ/XoAra06LStZqqm7IUpaDeHVSifK85VGngQOmJdOLNenM= 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=Qp24Fhpz; arc=none smtp.client-ip=209.85.214.182 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="Qp24Fhpz" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1dc96f64c10so37831905ad.1; Mon, 04 Mar 2024 00:21:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709540473; x=1710145273; 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; bh=DbhXUtIuWfzi5aPwa7I/ama+A79VZZWFfgaAfjPoNbU=; b=Qp24FhpzP6VAPf3MLepeWgmqtbvXvfHLf4cT7B5365+L+dF4R/labiJPXoOuglSEtD 8AggAqpkQzVckySw+KdrB9wMhFoiVG6zDMXT8/0VL8kWebNk15HaQj6dPRRsy7zQMgfj C4VJKS54leubbjoNWYPEv8mOgfhkqbqnPE3QDEOsi5CbNQo7YQr8x8VlZ8kM9GIQQ/oo tH3whE8+eI/rrY1PYr3+UquDHLi/uv2rYrGhYYIIPASQNEBOWr1rJckFldKNBjXLnE1y 2AU+EmGbYGwdDcGQsHDHpks3D7nG64lwfh5WTt3o6L2fvCn54iJSw1xJ8Fg88swev7j2 5x5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709540473; x=1710145273; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DbhXUtIuWfzi5aPwa7I/ama+A79VZZWFfgaAfjPoNbU=; b=rxH9YVHQy9v6pRmTmr8lqRezyAUB2MysFeidD7xALrJcNVepm+tELRnqYXztOMk161 yDhevyjoEENlqYU+ta9D+eBAaU2rPCVCPMNHsTHbC2CIe5/Y8yn9GfxAxUf8X+vbHzFH ykUVnHPg/4TTyGBVkcBsaa3zd0zHHr9EwmNDC2iRx2sNRkkyBGQnityA/WicqtiR5EpS nhPrAfDH8Ido5U3UWBjroJnHlo3435YfWeL1t21cYTeMNKB1b5AJdROwzqeLZbvbXHre 2DgB433QpaOOuhc3uODwO25kGGOUJDOZ4IZsIYHD/SS22QbyKFw3q88RykeX4e7R+EB6 rMJg== X-Forwarded-Encrypted: i=1; AJvYcCXoqQmZixqYJtrki9dc56qW9SLkgHoxvNY3/lAA40QWyYY4vot/7gGBfLhBBpZWZboha4cQOhSpyYT9CHH21D69UIzVUH9q X-Gm-Message-State: AOJu0YwEfD3Hbdz5HVPM+dqMrcT2ZEfcyoDvXO5dUe154//4lTh655fy QkMqarzl8mVaptF+oK/XGZGumPtZiHk9Tr/QLhRvQ6EXZgq9rjF8 X-Google-Smtp-Source: AGHT+IHUeUIF23uv6GPuXT/EYtS+w7zvgLtFRHg/ADJPpmaV6wdArsro2RbGlaPBItlJVtTgVmx0Sw== X-Received: by 2002:a17:902:cf03:b0:1dc:fc6c:60c2 with SMTP id i3-20020a170902cf0300b001dcfc6c60c2mr5816133plg.10.1709540473259; Mon, 04 Mar 2024 00:21:13 -0800 (PST) Received: from KERNELXING-MB0.tencent.com ([43.132.141.21]) by smtp.gmail.com with ESMTPSA id j12-20020a170902c3cc00b001dca9a6fdf1sm7897014plj.183.2024.03.04.00.21.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 00:21:12 -0800 (PST) From: Jason Xing To: ralf@linux-mips.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: linux-hams@vger.kernel.org, netdev@vger.kernel.org, kerneljasonxing@gmail.com, Jason Xing Subject: [PATCH net 07/12] netrom: Fix a data-race around sysctl_netrom_transport_busy_delay Date: Mon, 4 Mar 2024 16:20:41 +0800 Message-Id: <20240304082046.64977-8-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240304082046.64977-1-kerneljasonxing@gmail.com> References: <20240304082046.64977-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Jason Xing We need to protect the reader reading the sysctl value because the value can be changed concurrently. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Jason Xing --- net/netrom/af_netrom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 8ada0da3c0e0..10eee02ef99e 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -459,7 +459,7 @@ static int nr_create(struct net *net, struct socket *sock, int protocol, nr->n2 = msecs_to_jiffies(READ_ONCE(sysctl_netrom_transport_maximum_tries)); nr->t4 = - msecs_to_jiffies(sysctl_netrom_transport_busy_delay); + msecs_to_jiffies(READ_ONCE(sysctl_netrom_transport_busy_delay)); nr->idle = msecs_to_jiffies(sysctl_netrom_transport_no_activity_timeout); nr->window = sysctl_netrom_transport_requested_window_size; From patchwork Mon Mar 4 08:20:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13580171 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 EE518182BD; Mon, 4 Mar 2024 08:21:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540478; cv=none; b=cg0x1cj2NbVgVi9LzGiU75K+UUU+IoI2bqCSH6cWIbb+wQ+cBPi4SAPynvAofy+Cxf/ROyvWJbaxfhStUKEK0ikBLcm2evPDQ99P5dcRXn8Jz2OpkwPTE5BF4SQMOfINU+uU/9Gu6uDvWV8rehXU5FgSOGb3VV1hYPnaWJshdDs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540478; c=relaxed/simple; bh=/JX3EDfAm/pm7HZ0lVA/PyrKcEZ2225H82pvdSib4Ns=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uS6SWDMPHj2EYK/5aJBVVNAAzzdGRLjlzy/WdZQ0UMTWYfR1grp1csLNxEeuTjDjo74oxIAchAy2fd7hWbdN7C3rSowGgQCulFvk1lZNwQUg4vW2agD54r6JWBLnRyWoDos6grvEQ48r/PQBKyJybl//XhQQ9PBQVjJYrjj+3oM= 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=f+dqmAX1; arc=none smtp.client-ip=209.85.214.176 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="f+dqmAX1" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1dd10ae77d8so3716115ad.0; Mon, 04 Mar 2024 00:21:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709540476; x=1710145276; 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; bh=OWmy9bUEiF2UiMskihfOUITFhgDo9o0OZfPGv+6F5SQ=; b=f+dqmAX1FYfqk/N+daaXkIN96raALmBOJO0RDWEBGdzjoeQe/dylGyMFSbSBJEJ9gH ZXj+5z7V9+fCaipryg8ri8jAupP1PV1Qo5tEGzy1GzvkXRzqp/wWAoRL35rNhIDU8bQf WwG3gjvbtG0s3lrRXABksGRtqXiLwyUshaamGDElwGZvSFTYVW/3qylXVRmCK5BAE5WR rj54PyhnTJiY7eqwdsJYScg2uH1h1y9itnxotBswneYwfRrsz6hg6SjaJu//Twh/Yfu8 gJp3gdmAWoZNWP4sRXbPN2ZCDgklFS54yj3rUpC6OWikX1f6yiDjv7morIj1GRCPw8kV 1TOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709540476; x=1710145276; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OWmy9bUEiF2UiMskihfOUITFhgDo9o0OZfPGv+6F5SQ=; b=iCuV8TPMH66j9pMiN2eFZY63krvgYCzLB7DnG1sXYFWUzvppqIR2wO+eCtJZx9nnKh zSJv0GaKDnHAy7Hu0hCYKhKTTDhGSjPNL8KD3PdCKmIXkFGNUY29utR6mh+WqyQM0+gP P7BkKqqpu3bfI4A+XjCDoEM0+NZ5tCmJ5VAqRc9Il1HKw9WYoxVDrCnHhH9OOw9mgBAp 6I7I+yJeABfXSOB6etdPVP7tByEM0CNE9gybqhb5SvKejA+lsd9Mncb2GGxTZ6QGnVlO Y5ZYlLz1zkOpT5FJ3VwZudaAd9qsr/L25iDPIPBmgu1QPXL5wY7XpjGshMD/qO/Wq2Lu FjHA== X-Forwarded-Encrypted: i=1; AJvYcCXthmwCwESLm5BIKt3A+N94XYRqYf3mlO070odh3Tk4V3vAMlqWmsB6wuRDwa1GROieKvTmd6RRMpZRGKNkPz55M8m1g2Gy X-Gm-Message-State: AOJu0Yw8xj55iA0jsqBf+TsEsyKMhYKGy1iQH5w6Rwgl4lxcXeFO2cm/ QOr/MfesSDLqGs+ue4muIfYevCO5EDBukZkAHn9k0rz466g2A3FT X-Google-Smtp-Source: AGHT+IFF97n0quNulYsQogZ6yLN68eicpEy8a0tFhtqDcWZtGG9zkTGcuRlB9Df8wDJVxjQiSbkjrw== X-Received: by 2002:a17:903:483:b0:1dd:7e0:29c with SMTP id jj3-20020a170903048300b001dd07e0029cmr2836041plb.12.1709540476306; Mon, 04 Mar 2024 00:21:16 -0800 (PST) Received: from KERNELXING-MB0.tencent.com ([43.132.141.21]) by smtp.gmail.com with ESMTPSA id j12-20020a170902c3cc00b001dca9a6fdf1sm7897014plj.183.2024.03.04.00.21.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 00:21:15 -0800 (PST) From: Jason Xing To: ralf@linux-mips.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: linux-hams@vger.kernel.org, netdev@vger.kernel.org, kerneljasonxing@gmail.com, Jason Xing Subject: [PATCH net 08/12] netrom: Fix a data-race around sysctl_netrom_transport_requested_window_size Date: Mon, 4 Mar 2024 16:20:42 +0800 Message-Id: <20240304082046.64977-9-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240304082046.64977-1-kerneljasonxing@gmail.com> References: <20240304082046.64977-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Jason Xing We need to protect the reader reading the sysctl value because the value can be changed concurrently. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Jason Xing --- net/netrom/af_netrom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 10eee02ef99e..e65418fb9d88 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -462,7 +462,7 @@ static int nr_create(struct net *net, struct socket *sock, int protocol, msecs_to_jiffies(READ_ONCE(sysctl_netrom_transport_busy_delay)); nr->idle = msecs_to_jiffies(sysctl_netrom_transport_no_activity_timeout); - nr->window = sysctl_netrom_transport_requested_window_size; + nr->window = READ_ONCE(sysctl_netrom_transport_requested_window_size); nr->bpqext = 1; nr->state = NR_STATE_0; From patchwork Mon Mar 4 08:20:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13580172 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 BE7A51862B; Mon, 4 Mar 2024 08:21:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540481; cv=none; b=fKMoTVeN5aK9Krp8Zt0VnP/FI4EX/+r6UMpRZEfBTgz17xeH7Dx+lHMn2rO1wfcrc2GiuhtGZ2mHAgenJBSdYHLwEpz2DogLL/DLZwalP3ZtRk3MH2FLDlJ6lb9Ogl+duDd8Yh4JEQ4l3+MjAyYkJZcoW6LnP/EfB3Ep4GafPj4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540481; c=relaxed/simple; bh=sAYs2sB1EyIgScjGXf0vmm08sij1qYK1gP1AUyjeFXU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VZq5h+LF2/E6yNMQoUevQgq+i7AOhff3hCt+mr8zCKqjcqpeq1/ZUdQOHO8D8Wff/QQ991w/2IdJx8jXO/lxLu+ppodzZDaHAXvdkE+JE7YXas2xV6RWGZGfCgkPbPHh32/ud4OpLrLSvcQTltQ1bUMigd8/rI3p+lvj/1NQL5M= 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=aPt8tMY8; arc=none smtp.client-ip=209.85.214.181 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="aPt8tMY8" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1dc1ff58fe4so36576945ad.1; Mon, 04 Mar 2024 00:21:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709540479; x=1710145279; 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; bh=SZi39+Tv+XQEU0CyhWX4+9P6AIX5XUlJhwY1mEwuqDU=; b=aPt8tMY89XeiybGcWYzacU8Ii2BJAXcpDHSI31XCoyMDZC0QFn7g7dsYirGfp1aVXW QC2cJfNaKAUdBL/s67qkiVSLT2Mh/cdEOy9exQs5yiAGtUgljxrQ6ft71vTFGmi4ggtK zjGhn4eSV0m/lDh4I6E7A/CGutonfyQQCSMxrOLmClhuojpkp8lIpFmXyAHo1Spwl+U1 Qr7p10zcyZDVUH3dgZqpWzSdY3AcIMgLCyduh3yuV2uxW5afo8XLH8v5HYHFu6+BFpUx cYr39OfWqe0e+tglzwCzSrdgnl6tHWfBnWEqKOL8bdCO++yQ0nRJNymMnkEfA/kojp1x 0QOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709540479; x=1710145279; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SZi39+Tv+XQEU0CyhWX4+9P6AIX5XUlJhwY1mEwuqDU=; b=FSD87sC1hC4sBp9BYoY6dAH6EyT3sHxasVNocCYYeWYgt5OUT9WejbsWKP32dgHAdE a3v7JjglB5duT8kTccbO/toTeu/Pk/LYEIkY9DmUiwT5rg6BO+M3ccALKcSPqaQTRn+R +UP4gfAO4jUZWt76R2KyLt61DcePmCEk2PW02ms1nKjPNCczLSdanVPkwoe4RcA0DL28 lA1HA+6+d9PSyklQoeAkDk05+0CliFVTD1DGBmXuzBQfxCoj/8R4z5JqrDESnfKX1Uy9 xoaQxsoJoe+Htiv3BtUuNjDEmETTv2yTvLP1vMTzUJUgyQ3zHljNFtAh+65iwgIgPUeo Ga/g== X-Forwarded-Encrypted: i=1; AJvYcCWEYGXGiz/IHSgI7gHeSDyl/DrzFpoC4HdUCECfOMDN9DSnFGvgihhi7xlWK14eMxIuDT5iRVg3kM51BrEFExrbxg9tyCjZ X-Gm-Message-State: AOJu0Yy6GOLbz6+RrUDc/X9IMRJa/MMD0YGXbbXqF3uif2wypu1YjQmJ qP783UIk4wuGpadSoAB1IpWWLGgnKArjYZL1QS4CyjGm8mtMBeIZ X-Google-Smtp-Source: AGHT+IFpB7WTYhnMvD2J9T43fCWzIliWGuO/CzQBChOFkGYdNRCuS/NVxuE34OS75+AInD7nSvyQBw== X-Received: by 2002:a17:903:2347:b0:1dc:cf17:8a6b with SMTP id c7-20020a170903234700b001dccf178a6bmr11040968plh.43.1709540479292; Mon, 04 Mar 2024 00:21:19 -0800 (PST) Received: from KERNELXING-MB0.tencent.com ([43.132.141.21]) by smtp.gmail.com with ESMTPSA id j12-20020a170902c3cc00b001dca9a6fdf1sm7897014plj.183.2024.03.04.00.21.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 00:21:18 -0800 (PST) From: Jason Xing To: ralf@linux-mips.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: linux-hams@vger.kernel.org, netdev@vger.kernel.org, kerneljasonxing@gmail.com, Jason Xing Subject: [PATCH net 09/12] netrom: Fix a data-race around sysctl_netrom_transport_no_activity_timeout Date: Mon, 4 Mar 2024 16:20:43 +0800 Message-Id: <20240304082046.64977-10-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240304082046.64977-1-kerneljasonxing@gmail.com> References: <20240304082046.64977-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Jason Xing We need to protect the reader reading the sysctl value because the value can be changed concurrently. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Jason Xing --- net/netrom/af_netrom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index e65418fb9d88..1671be042ffe 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -461,7 +461,7 @@ static int nr_create(struct net *net, struct socket *sock, int protocol, nr->t4 = msecs_to_jiffies(READ_ONCE(sysctl_netrom_transport_busy_delay)); nr->idle = - msecs_to_jiffies(sysctl_netrom_transport_no_activity_timeout); + msecs_to_jiffies(READ_ONCE(sysctl_netrom_transport_no_activity_timeout)); nr->window = READ_ONCE(sysctl_netrom_transport_requested_window_size); nr->bpqext = 1; From patchwork Mon Mar 4 08:20:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13580173 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (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 C481818657; Mon, 4 Mar 2024 08:21:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540484; cv=none; b=QgvS1WBC8z/oKDZFhNVo4ulBqly4Ki0ylp1G5STRkarTl71y+HAQh5nOMIgfx2xnTNNH61LKMhsZvFF8d+yC7T+jvbYOXaGebMEfIoNY9CSPR/I+4O9EE106c0H6Gsnzrm2uQV9qbhc2MSmx/Q4kRIFa8+Lna27ufIujgAu1X7Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540484; c=relaxed/simple; bh=yZmoO37vd/6JnMiTJ9i1h0agcHOeJ1McoImROpDLm8c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=s7AsMsyjtsI4O5S6tObS9ZAYZdhhj/p0h77PlWG8lME6KyaHwLVZAfm8DMqgKf8wwBfnfsoRGKu704h5CU56XDrAZImlE1R9JnLOwbzvJdh0aQyL8hjwdQ9LydYNQlsK4PeOhaIcWKfVFYt+MVMJ19MmarwfgYmQ9jqvtIDgt/w= 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=bVeas/vc; arc=none smtp.client-ip=209.85.214.181 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="bVeas/vc" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1dcc7f4717fso42077995ad.0; Mon, 04 Mar 2024 00:21:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709540482; x=1710145282; 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; bh=DW2JvBjyQ/dl4LWY/5yqaKfIRNuoL8KMS2IldX3Conk=; b=bVeas/vccibIfygyhQz53gKBkh5V/xoVJi5TMdDjd6Pl5VEhxATDsr71eIzM5JzBuv 2b8DB7/4sTjufMJlxiXgVBNxsXULJEc53yo9UtrhmQ22q5t/togo8PGYesNKaamxEMAK odU1TFNmT+4/x2esIZ3rsuOU7uX1bwgsrN4KU8U7lQifp8pNK+kdrxWCn+U638r4lmuI eTCq8ZvjLT37s4tTWeSq0gBgWmoulYnfDT6zjl7UoIJHK5rAVoADR8/RTI/bUJUpDGms RNj0ukwgeMKjD0pV/ePm1fAUe5o/r/2CJNd22cAFgTPysakN0iM2KTZMfy/KMMquNKQd 03EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709540482; x=1710145282; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DW2JvBjyQ/dl4LWY/5yqaKfIRNuoL8KMS2IldX3Conk=; b=gOzYjFbUbUYxwUWt8RI4KxuW+ZnJag6/5thZU8mpZRgNHooIhSv6JB0IEnuvvZ2jbh t0ODii+YYPzHTEGOcc4lgL07A6RVkRsp/r9m1NrpxwivduiYOcf1xE0rnFrLJ6Q48XJ3 VB8Wj7gheDU02HV0n5vpLTH58vMn9H1vmuTtSEG/fUvxZezvd1smQMw1Yub9gNQOKUSP RF2i77RKwmJSnrC0b21/KH/HlHK3/THgaaCFu8VLqT2qlKDMBVLwzItIy/vdY6oL1nm0 +lBjo1LU8B4iEemlp5fNuYwqx5ZFTT6Dw+DJlg5SjWdmhf/knznJev5HlXE9cWi78RxI 6EMA== X-Forwarded-Encrypted: i=1; AJvYcCUnA6CxrTJ5ligfSSJnxKZFw/tNFWnA36AUtqOICGfePciskrUO802PEQa3wD9wDNnYijiaL12jBIHdeZuUdCnIrL68xTPj X-Gm-Message-State: AOJu0YzDj3+W93FYRwk6IONtpRxQNZwlhjO7EYJzgvNx4BnBR0eAv78q bdosheiN1eH0Em8ciVkclp70du0mn3KdP3CytpfH7/Ndvn9e7lDt X-Google-Smtp-Source: AGHT+IFcUFrmrE1kJG+3SpqOhmm0Vt2bY1r8EVLzEx0COn71YwTc1B2d915cUuC68El+OboUwuRmmA== X-Received: by 2002:a17:902:ea11:b0:1dc:d515:79c8 with SMTP id s17-20020a170902ea1100b001dcd51579c8mr11237347plg.23.1709540482127; Mon, 04 Mar 2024 00:21:22 -0800 (PST) Received: from KERNELXING-MB0.tencent.com ([43.132.141.21]) by smtp.gmail.com with ESMTPSA id j12-20020a170902c3cc00b001dca9a6fdf1sm7897014plj.183.2024.03.04.00.21.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 00:21:21 -0800 (PST) From: Jason Xing To: ralf@linux-mips.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: linux-hams@vger.kernel.org, netdev@vger.kernel.org, kerneljasonxing@gmail.com, Jason Xing Subject: [PATCH net 10/12] netrom: Fix a data-race around sysctl_netrom_routing_control Date: Mon, 4 Mar 2024 16:20:44 +0800 Message-Id: <20240304082046.64977-11-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240304082046.64977-1-kerneljasonxing@gmail.com> References: <20240304082046.64977-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Jason Xing We need to protect the reader reading the sysctl value because the value can be changed concurrently. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Jason Xing --- net/netrom/nr_route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netrom/nr_route.c b/net/netrom/nr_route.c index b8ddd8048f35..89e12e6eea2e 100644 --- a/net/netrom/nr_route.c +++ b/net/netrom/nr_route.c @@ -780,7 +780,7 @@ int nr_route_frame(struct sk_buff *skb, ax25_cb *ax25) return ret; } - if (!sysctl_netrom_routing_control && ax25 != NULL) + if (!READ_ONCE(sysctl_netrom_routing_control) && ax25 != NULL) return 0; /* Its Time-To-Live has expired */ From patchwork Mon Mar 4 08:20:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13580174 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 4473C17BC7; Mon, 4 Mar 2024 08:21:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540487; cv=none; b=Qyb7jI3wH4vu0ytlm6dyaFM5jGka14MgqqnO1JH0skR4qTBNpoQtEwdZ2yWJuAWm8uN3W/6eJBQG/DOjDrJbHe9oID1TR0c+revBmgJRM13fOyKnHntKPtg+m0qona6uvv0txcbLCf2+eHIcxwW2YBtzADIqKa9C+yYs/jpX6co= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540487; c=relaxed/simple; bh=l+nl5U9gUiRcrhAmCFKOdJkQy4rCXq/0wTXqHsmUOwI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sLHEOLb7Hlje5myyCDOBxXogA+MI35B2sk9F+EY2zqNLdIlgaTMdCV14Osk2Z0f7Okvg47mDjXCDaGQkxwuJCpAilFi0r2GtldGI0FMJBCRBZBEWrUiHaAkGLfE9AoTZlHMG0hzTzCT7lGVZ8oAmMC/9HtmZ/Q01tM1G8k4WcSs= 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=ALBb7snR; arc=none smtp.client-ip=209.85.214.170 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="ALBb7snR" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1dc5d0162bcso35019945ad.0; Mon, 04 Mar 2024 00:21:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709540485; x=1710145285; 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; bh=kpAr65Sbm9LW0YCuSNo2yuiYCmshjb/xMNGbnC9d5DA=; b=ALBb7snRk03zb5sKzfrgS9H6hYAIFr1E6614AdSwY69/fpjiVduyfCKJl6kPTN4Rup fgAwUL0qCSOOY+3jZ3hXfRDKGsMS4zZDtyPbp0zh6vrZwfBUr1+OZ0DlFdb2MPGmeKd2 QvQh2m4eB6u6Dcyv5DHrfP3BiyAYcyD0PAG28a/WWodLDatjXqjLaUd9YDsHZhactDAf RUuSQB8vVBJtuR4LkwWRcnjjb/m2MwNvaYdDmHg/29Y+Deny6AWGzyO7CGbN9pdCLV3Z NL69T0kY01pZ4CZa+WkanSqpNW5IzKoMpPh2LSUyBdyogioVywNvX4FbikGRWwZARjBx ifFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709540485; x=1710145285; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kpAr65Sbm9LW0YCuSNo2yuiYCmshjb/xMNGbnC9d5DA=; b=TLA577TVpPzSto4i8QBDnEzCby1d6nPCIUgOGXcu9woxuRnXsSDqbPsMS/R0hTxMQt Ij5iF4/HEkJezkrJGp59Q11z9zcIzbtHq+uFGwk6Xe64ClpoUrDJnCfO/W3rDoAlyR5p O1joKuJ5LPhhHM3DoxRuJak3ATe+TgAZlI+9IGaub8Uf/jPuoaPEW2vJqw/ggUTK7swA aLeIO9mzYNY+DkQ+eV/sf96Zueu2JlcGT3JexzPkUTin1WEQA9clTlBK65IHPuNDulo7 7EjbHKT8mxmrJSqL20EnxQZqgExdfyx7MH3W0xTayadX7Z/OBc4tcEw4aZ0l9Mm75oxZ pBZQ== X-Forwarded-Encrypted: i=1; AJvYcCWXV2kEfZy0in/uus5ntPepwdW5dn0ED18qf4Tdk1pBLzC1QpuGFz0+yjIm6MGS1cGVyP7itbeEXxBy3/RCDtN9CqtNZnG/ X-Gm-Message-State: AOJu0YwS2RVOj0ZUA2IEU9ktcMMoCP+CJFa/7a54Y1V0qFaBFGvyFAYR DgarEqfoQK0RhhfttN9swME0BzOu6F/VbtkOek/M8FMmnP5mLzgt X-Google-Smtp-Source: AGHT+IGRaGO4WTuo5bXk3RmyfcuoVbeF9kDlApCU7UvX6DHah5bG9EpFMtrbFU2QeKfAI+rktdKeGQ== X-Received: by 2002:a17:902:ecc5:b0:1dd:7db:69ce with SMTP id a5-20020a170902ecc500b001dd07db69cemr4005022plh.51.1709540485538; Mon, 04 Mar 2024 00:21:25 -0800 (PST) Received: from KERNELXING-MB0.tencent.com ([43.132.141.21]) by smtp.gmail.com with ESMTPSA id j12-20020a170902c3cc00b001dca9a6fdf1sm7897014plj.183.2024.03.04.00.21.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 00:21:24 -0800 (PST) From: Jason Xing To: ralf@linux-mips.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: linux-hams@vger.kernel.org, netdev@vger.kernel.org, kerneljasonxing@gmail.com, Jason Xing Subject: [PATCH net 11/12] netrom: Fix a data-race around sysctl_netrom_link_fails_count Date: Mon, 4 Mar 2024 16:20:45 +0800 Message-Id: <20240304082046.64977-12-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240304082046.64977-1-kerneljasonxing@gmail.com> References: <20240304082046.64977-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Jason Xing We need to protect the reader reading the sysctl value because the value can be changed concurrently. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Jason Xing --- net/netrom/nr_route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netrom/nr_route.c b/net/netrom/nr_route.c index 89e12e6eea2e..70480869ad1c 100644 --- a/net/netrom/nr_route.c +++ b/net/netrom/nr_route.c @@ -728,7 +728,7 @@ void nr_link_failed(ax25_cb *ax25, int reason) nr_neigh->ax25 = NULL; ax25_cb_put(ax25); - if (++nr_neigh->failed < sysctl_netrom_link_fails_count) { + if (++nr_neigh->failed < READ_ONCE(sysctl_netrom_link_fails_count)) { nr_neigh_put(nr_neigh); return; } From patchwork Mon Mar 4 08:20:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Xing X-Patchwork-Id: 13580175 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 F283218E10; Mon, 4 Mar 2024 08:21:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540490; cv=none; b=W1KsBxLOoOaMRxWekEs2L6z0T7R6eihR/wh6BpTs6c19THXBLtgFAXiLm8bd3RLr7gj7vwaU4A9vGjp+uBCoEaoYDLvBDlw0f/x30/6vqw5YaWi1FYw9tXeOBLY+2i1l8ShhXMtdypi+mRdgcCHIIkH97DrW9/LCFAlLftLJ7/A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709540490; c=relaxed/simple; bh=iUd1+h9Zu2i16qT9+q3U3uxvtz4TxEhADLcr/8i2Ues=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Hdk2M0AijSKXX40KMNa6JbfB6lzrrKaD6ZAy8UqPRRsA4AWuba1pmZLhyTS1JGNfV333Jw88JlQeOUaBei73PI06v7JTEQfC48TboFniqEYOnO3mJH1PphqbqTZBs6Fgx7o1E9jyq8nbhWbPBoppxE9bSJatg/EV0mV7POwTGA0= 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=cwEJQ/Kz; arc=none smtp.client-ip=209.85.214.169 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="cwEJQ/Kz" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1dc418fa351so37844715ad.1; Mon, 04 Mar 2024 00:21:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709540488; x=1710145288; 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; bh=VZFq0Za5EFtHyYLLbHcoR4yWS/R5Nw5TqGrWr6tkvzI=; b=cwEJQ/KzjnL0ZJhT4N1ZEcqEHjg69ARj3DeoCwTd8zlNJCDVLnZzC2LmjnUJHMtmwV vmJabjZlJV0b5Ol4YNOtYtxnkkDHeT6y2kbl0knx3rgqJb0gicmUaqClafjRmTPor6Ad Ljco42Bfgn38ros+TDGbjGXRcicU+e9mtowc8qv8qNzLufVLITCLdel0AxXBwNxHK3vp +K/7OTNZAcCDqDMksSJRM8j1TIamKOIIGnwhVasDdf/8j7jfz3V5FfJLLCpRX4cBtqNL vKO/0gUs9CUFbYS9YCQMgwAZAhRG3W7DGnU6uG9xZGicHOZKkfwTFjJQmqcgm8kD1jqJ QB+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709540488; x=1710145288; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VZFq0Za5EFtHyYLLbHcoR4yWS/R5Nw5TqGrWr6tkvzI=; b=P9G4MWfRyJ9HwZYsPWoVVi6JCTxsjG35bVHsll+kXeFZ8P9yZWG5AWb9vaw8wEDz6Q nKK3YurCShrDzSrWWznXZNB8uZUr5dfOL1iHmRA5t9da8jYMdYc/93nG51NIoD9JUqbQ IebpFiTEJDZTQzJG0qL7yXAaAt8SeT9L6Uh9NG1/VsegB+FjLTNIwhQmuYtzTr1w6+gO Ja90Q/uJ5ewxsRqZ4CErBQS9tjU+U9lExBbQIz0zwGjj/G4SgFI1D/Z9w4LTFnyY1Yqh foVmhiEw3bu1MDJzagsdQdqSoViMjbYVARHDEDs9I5ul3FjcQHGGSvqwO8x95Jt3swxp ZMXg== X-Forwarded-Encrypted: i=1; AJvYcCX4NjUtmxlbrtW6TLF2KU9KaPoXmcHrNQsBkhIiUrtGj4Dkfbt21vlGz7whgy7oee9cHdBm3IqblGZH6PwZl8jQ4WuZfBUD X-Gm-Message-State: AOJu0YwUiI2ICQpTm5FefEcH0D7jzjTgjBp7erM6UtA/jGkyqIoxmBve Gv7PGDKHg/ynUWnyUHTCYufmengJ0d4rFqBzQPfNkWOXLr7j6J52 X-Google-Smtp-Source: AGHT+IGS37CSlS05KVWi+6sDThEBhGRc6petPQNRDWBCTCRqWuOk6N+fdjWBmO5nIgoAeNSu6PDjsA== X-Received: by 2002:a17:902:f944:b0:1db:fc18:2da5 with SMTP id kx4-20020a170902f94400b001dbfc182da5mr11851000plb.30.1709540488419; Mon, 04 Mar 2024 00:21:28 -0800 (PST) Received: from KERNELXING-MB0.tencent.com ([43.132.141.21]) by smtp.gmail.com with ESMTPSA id j12-20020a170902c3cc00b001dca9a6fdf1sm7897014plj.183.2024.03.04.00.21.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 00:21:27 -0800 (PST) From: Jason Xing To: ralf@linux-mips.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: linux-hams@vger.kernel.org, netdev@vger.kernel.org, kerneljasonxing@gmail.com, Jason Xing Subject: [PATCH net 12/12] netrom: Fix data-races around sysctl_net_busy_read Date: Mon, 4 Mar 2024 16:20:46 +0800 Message-Id: <20240304082046.64977-13-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20240304082046.64977-1-kerneljasonxing@gmail.com> References: <20240304082046.64977-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Jason Xing We need to protect the reader reading the sysctl value because the value can be changed concurrently. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Jason Xing --- net/netrom/af_netrom.c | 2 +- net/netrom/nr_in.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 1671be042ffe..104a80b75477 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -954,7 +954,7 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev) * G8PZT's Xrouter which is sending packets with command type 7 * as an extension of the protocol. */ - if (sysctl_netrom_reset_circuit && + if (READ_ONCE(sysctl_netrom_reset_circuit) && (frametype != NR_RESET || flags != 0)) nr_transmit_reset(skb, 1); diff --git a/net/netrom/nr_in.c b/net/netrom/nr_in.c index 2f084b6f69d7..97944db6b5ac 100644 --- a/net/netrom/nr_in.c +++ b/net/netrom/nr_in.c @@ -97,7 +97,7 @@ static int nr_state1_machine(struct sock *sk, struct sk_buff *skb, break; case NR_RESET: - if (sysctl_netrom_reset_circuit) + if (READ_ONCE(sysctl_netrom_reset_circuit)) nr_disconnect(sk, ECONNRESET); break; @@ -128,7 +128,7 @@ static int nr_state2_machine(struct sock *sk, struct sk_buff *skb, break; case NR_RESET: - if (sysctl_netrom_reset_circuit) + if (READ_ONCE(sysctl_netrom_reset_circuit)) nr_disconnect(sk, ECONNRESET); break; @@ -262,7 +262,7 @@ static int nr_state3_machine(struct sock *sk, struct sk_buff *skb, int frametype break; case NR_RESET: - if (sysctl_netrom_reset_circuit) + if (READ_ONCE(sysctl_netrom_reset_circuit)) nr_disconnect(sk, ECONNRESET); break;