Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b00917be authored by Dmitry Eremin's avatar Dmitry Eremin Committed by Greg Kroah-Hartman
Browse files

staging: lustre: Fix possible NULL pointer dereference in lprocfs_status.c 



The imp->imp_connection really could be NULL, we better check for it
before dereferencing it in taht call to libcfs_nid2str_r.

Signed-off-by: default avatarDmitry Eremin <dmitry.eremin@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6507
Reviewed-on: http://review.whamcloud.com/14808


Reviewed-by: default avatarBob Glossman <bob.glossman@intel.com>
Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9563fe8a

drivers/staging/lustre/lustre/obdclass/lprocfs_status.c

+6 −3
Original line number Diff line number Diff line
@@ -665,15 +665,18 @@ int lprocfs_rd_import(struct seq_file *m, void *data) 
		seq_printf(m, "%s%s", j ? ", " : "", nidstr);

		j++;

	}

	if (imp->imp_connection != NULL)

		libcfs_nid2str_r(imp->imp_connection->c_peer.nid,

				 nidstr, sizeof(nidstr));

	else

		strncpy(nidstr, "<none>", sizeof(nidstr));

	seq_printf(m,

		      "]\n"

		      "       current_connection: %s\n"

		      "       connection_attempts: %u\n"

		      "       generation: %u\n"

		      "       in-progress_invalidations: %u\n",

		      imp->imp_connection == NULL ? "<none>" : nidstr,

		      nidstr,

		      imp->imp_conn_cnt,

		      imp->imp_generation,

		      atomic_read(&imp->imp_inval_count));