From: Jakub Kicinski <kuba@kernel.org>
Date: Tue, 21 Feb 2023 17:26:22 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d1fabc68f8e0541d41657096dc713cb01775652d;p=linux.git

Merge git://git./linux/kernel/git/netdev/net

Per-next-PR merge.

net/smc/af_smc.c
  b5dd4d698171 ("net/smc: llc_conf_mutex refactor, replace it with rw_semaphore")
  e40b801b3603 ("net/smc: fix potential panic dues to unprotected smc_llc_srv_add_link()")
https://lore.kernel.org/all/20230221124008.6303c330@canb.auug.org.au/

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

d1fabc68f8e0541d41657096dc713cb01775652d
diff --cc MAINTAINERS
index 20b25511e18d2,1ba493cb777fb..4df1a6e89fe70
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4814,11 -4807,12 +4814,11 @@@ F:	net/sched/sch_etf.
  F:	net/sched/sch_taprio.c
  
  CC2520 IEEE-802.15.4 RADIO DRIVER
- M:	Varka Bhadram <varkabhadram@gmail.com>
+ M:	Stefan Schmidt <stefan@datenfreihafen.org>
  L:	linux-wpan@vger.kernel.org
- S:	Maintained
+ S:	Odd Fixes
  F:	Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
  F:	drivers/net/ieee802154/cc2520.c
 -F:	include/linux/spi/cc2520.h
  
  CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER
  M:	Gilad Ben-Yossef <gilad@benyossef.com>
diff --cc net/smc/af_smc.c
index d7a7420e81ec4,d9413d43b1045..a4cccdfdc00a2
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@@ -1839,8 -1826,10 +1839,10 @@@ static int smcr_serv_conf_first_link(st
  	smc_llc_link_active(link);
  	smcr_lgr_set_type(link->lgr, SMC_LGR_SINGLE);
  
 -	mutex_lock(&link->lgr->llc_conf_mutex);
++	down_write(&link->lgr->llc_conf_mutex);
  	/* initial contact - try to establish second link */
  	smc_llc_srv_add_link(link, NULL);
 -	mutex_unlock(&link->lgr->llc_conf_mutex);
++	up_write(&link->lgr->llc_conf_mutex);
  	return 0;
  }