aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryn M. Reeves <bmr@redhat.com>2013-08-14 15:59:45 +0100
committerBryn M. Reeves <bmr@redhat.com>2013-08-14 15:59:45 +0100
commitdc9d2128699d6c550c626f375f0d6a974426fc85 (patch)
treef7ea71ac7fc6728871deb1d8557e108d1ed84ae4
parent44e01afbd86f60760af85ad64810e56cf5e77140 (diff)
downloadsos-dc9d2128699d6c550c626f375f0d6a974426fc85.tar.gz
Do not attempt to read use-gss-proxy file in procfs
The networking plug-in scoops up /proc/net. There are some pseudo- files in here that we should avoid touching. These either have side-effects or hang the reading process. Add a forbidden path for the /proc/net/rpc/*/{channel,flush} files as these will cause side-effects for RPC applications running on the host. Forward port of commit 61585d4 on rhel-6 branch. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
-rw-r--r--sos/plugins/networking.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py
index 8d3509bb..90e1b58b 100644
--- a/sos/plugins/networking.py
+++ b/sos/plugins/networking.py
@@ -81,6 +81,8 @@ class Networking(Plugin):
"/etc/NetworkManager/system-connections",
"/etc/dnsmasq*"])
self.add_forbidden_path("/proc/net/rpc/use-gss-proxy")
+ self.add_forbidden_path("/proc/net/rpc/*/channel")
+ self.add_forbidden_path("/proc/net/rpc/*/flush")
ip_addr_file=self.get_cmd_output_now("ip -o addr", root_symlink = "ip_addr")
ip_addr_out=self.call_ext_prog("ip -o addr")