ipc,shm: cleanup do_shmat pasta (f42569b1) · Commits · 戴 / test

Clean up some of the messy do_shmat() spaghetti code, getting rid of out_free and out_put_dentry labels. This makes shortening the critical region of this function in the next patch a little easier to do and read. Signed-off-by:

Davidlohr Bueso <davidlohr.bueso@hp.com> Tested-by:

Sedat Dilek <sedat.dilek@gmail.com> Cc: Rik van Riel <riel@redhat.com> Cc: Manfred Spraul <manfred@colorfullife.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

ipc/shm.c

+12 −14

Original line number	Diff line number	Diff line
		@@ -1108,16 +1108,21 @@ long do_shmat(int shmid, char __user shmaddr, int shmflg, ulong raddr,

		err = -ENOMEM;
		sfd = kzalloc(sizeof(*sfd), GFP_KERNEL);
		if (!sfd)
		goto out_put_dentry;
		if (!sfd) {
		path_put(&path);
		goto out_nattch;
		}

		file = alloc_file(&path, f_mode,
		is_file_hugepages(shp->shm_file) ?
		&shm_file_operations_huge :
		&shm_file_operations);
		err = PTR_ERR(file);
		if (IS_ERR(file))
		goto out_free;
		if (IS_ERR(file)) {
		kfree(sfd);
		path_put(&path);
		goto out_nattch;
		}

		file->private_data = sfd;
		file->f_mapping = shp->shm_file->f_mapping;
		@@ -1167,19 +1172,12 @@ out_nattch:
		else
		shm_unlock(shp);
		up_write(&shm_ids(ns).rw_mutex);

		out:
		return err;

		out_unlock:
		shm_unlock(shp);
		goto out;

		out_free:
		kfree(sfd);
		out_put_dentry:
		path_put(&path);
		goto out_nattch;
		out:
		return err;
		}

		SYSCALL_DEFINE3(shmat, int, shmid, char __user *, shmaddr, int, shmflg)

Admin message