ceph: avoid panic in create_session_open_msg() if utsname() returns NULL (717e6f28) · Commits · 戴 / test

fs/ceph/mds_client.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@
		#include <linux/sched.h>
		#include <linux/debugfs.h>
		#include <linux/seq_file.h>
		#include <linux/utsname.h>
		#include <linux/ratelimit.h>

		#include "super.h"
		@@ -884,8 +883,8 @@ static struct ceph_msg create_session_open_msg(struct ceph_mds_client mdsc, u6
		void *p;

		const char* metadata[][2] = {
		{"hostname", utsname()->nodename},
		{"kernel_version", utsname()->release},
		{"hostname", mdsc->nodename},
		{"kernel_version", init_utsname()->release},
		{"entity_id", opt->name ? : ""},
		{"root", fsopt->server_path ? : "/"},
		{NULL, NULL}
		@@ -3539,6 +3538,8 @@ int ceph_mdsc_init(struct ceph_fs_client *fsc)
		init_rwsem(&mdsc->pool_perm_rwsem);
		mdsc->pool_perm_tree = RB_ROOT;

		strncpy(mdsc->nodename, utsname()->nodename,
		sizeof(mdsc->nodename) - 1);
		return 0;
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@
		#include <linux/rbtree.h>
		#include <linux/spinlock.h>
		#include <linux/refcount.h>
		#include <linux/utsname.h>

		#include <linux/ceph/types.h>
		#include <linux/ceph/messenger.h>
		@@ -368,6 +369,8 @@ struct ceph_mds_client {

		struct rw_semaphore pool_perm_rwsem;
		struct rb_root pool_perm_tree;

		char nodename[__NEW_UTS_LEN + 1];
		};

		extern const char *ceph_mds_op_name(int op);