Merge "icnss: fix the memory and kernel info leak due to the race condition"