Append_flag was removed.

4 files changed, 6 insertions, 51 deletions

diff --git a/examples/ncr.c b/examples/ncr.c
index 69e699a..f99450a 100644
--- a/examples/ncr.c
+++ b/examples/ncr.c
@@ -119,7 +119,6 @@ test_ncr_key(int cfd)
 	kdata.desc = dinit.desc;
 	kdata.data = data;
 	kdata.data_size = sizeof(data);
-	kdata.append_flag = 0;
 
 	if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) {
 		fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
@@ -179,7 +178,6 @@ test_ncr_key(int cfd)
 	kdata.desc = dinit.desc;
 	kdata.data = data;
 	kdata.data_size = sizeof(data);
-	kdata.append_flag = 0;
 
 	if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) {
 		fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
@@ -237,7 +235,6 @@ test_ncr_key(int cfd)
 	kdata.desc = dinit.desc;
 	kdata.data = data;
 	kdata.data_size = sizeof(data);
-	kdata.append_flag = 0;
 
 	if (ioctl(cfd, NCRIO_DATA_GET, &kdata)==0) {
 		fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
@@ -285,7 +282,6 @@ static int test_ncr_data(int cfd)
 	kdata.desc = init.desc;
 	kdata.data = data;
 	kdata.data_size = sizeof(data);
-	kdata.append_flag = 0;
 
 	if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) {
 		perror("ioctl(NCRIO_DATA_GET)");
@@ -305,7 +301,6 @@ static int test_ncr_data(int cfd)
 	kdata.desc = init.desc;
 	kdata.data = data;
 	kdata.data_size = sizeof(data);
-	kdata.append_flag = 0;
 
 	if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) {
 		perror("ioctl(NCRIO_DATA_SET)");
@@ -318,7 +313,6 @@ static int test_ncr_data(int cfd)
 	kdata.desc = init.desc;
 	kdata.data = data;
 	kdata.data_size = sizeof(data);
-	kdata.append_flag = 0;
 
 	if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) {
 		perror("ioctl(NCRIO_DATA_GET)");
@@ -354,7 +348,6 @@ static int test_ncr_data(int cfd)
 	kdata.desc = init.desc;
 	kdata.data = data;
 	kdata.data_size = sizeof(data);
-	kdata.append_flag = 0;
 
 	if (ioctl(cfd, NCRIO_DATA_GET, &kdata)==0) {
 		fprintf(stderr, "Unexportable data were exported!?\n");
@@ -438,7 +431,6 @@ test_ncr_wrap_key(int cfd)
 	kdata.data = DKEY;
 	kdata.data_size = 16;
 	kdata.desc = dinit.desc;
-	kdata.append_flag = 0;
 
 	if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) {
 		fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
@@ -483,7 +475,6 @@ test_ncr_wrap_key(int cfd)
 
 	kdata.data = data;
 	kdata.data_size = sizeof(data);
-	kdata.append_flag = 0;
 
 	if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) {
 		fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
@@ -603,7 +594,6 @@ test_ncr_store_wrap_key(int cfd)
 	kdata.data = DKEY;
 	kdata.data_size = 16;
 	kdata.desc = dd;
-	kdata.append_flag = 0;
 
 	if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) {
 		fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
@@ -788,7 +778,6 @@ test_ncr_aes(int cfd)
 		kdata.data = (void*)aes_vectors[i].key;
 		kdata.data_size = 16;
 		kdata.desc = dd;
-		kdata.append_flag = 0;
 
 		if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) {
 			fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
@@ -808,7 +797,6 @@ test_ncr_aes(int cfd)
 		kdata.data = (void*)aes_vectors[i].plaintext;
 		kdata.data_size = 16;
 		kdata.desc = dd;
-		kdata.append_flag = 0;
 
 		if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) {
 			fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
@@ -834,7 +822,6 @@ test_ncr_aes(int cfd)
 		kdata.desc = dd2;
 		kdata.data = data;
 		kdata.data_size = sizeof(data);
-		kdata.append_flag = 0;
 
 		if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) {
 			fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
@@ -865,7 +852,6 @@ test_ncr_aes(int cfd)
 		kdata.data = (void*)aes_vectors[i].key;
 		kdata.data_size = 16;
 		kdata.desc = dd;
-		kdata.append_flag = 0;
 
 		if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) {
 			fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
@@ -886,7 +872,6 @@ test_ncr_aes(int cfd)
 		kdata.data = (void*)aes_vectors[i].ciphertext;
 		kdata.data_size = 16;
 		kdata.desc = dd;
-		kdata.append_flag = 0;
 
 		if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) {
 			fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
@@ -912,7 +897,6 @@ test_ncr_aes(int cfd)
 		kdata.desc = dd2;
 		kdata.data = data;
 		kdata.data_size = sizeof(data);
-		kdata.append_flag = 0;
 
 		if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) {
 			fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
@@ -1081,7 +1065,6 @@ test_ncr_hash(int cfd)
 			kdata.data = (void*)hash_vectors[i].key;
 			kdata.data_size = hash_vectors[i].key_size;
 			kdata.desc = dd;
-			kdata.append_flag = 0;
 
 			if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) {
 				fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
@@ -1102,7 +1085,6 @@ test_ncr_hash(int cfd)
 		kdata.data = (void*)hash_vectors[i].plaintext;
 		kdata.data_size = hash_vectors[i].plaintext_size;
 		kdata.desc = dd;
-		kdata.append_flag = 0;
 
 		if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) {
 			fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
@@ -1129,7 +1111,6 @@ test_ncr_hash(int cfd)
 		kdata.desc = dd2;
 		kdata.data = data;
 		kdata.data_size = sizeof(data);
-		kdata.append_flag = 0;
 
 		if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) {
 			fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
diff --git a/examples/pk.c b/examples/pk.c
index 0765638..1f3d3c1 100644
--- a/examples/pk.c
+++ b/examples/pk.c
@@ -644,7 +644,6 @@ static int test_ncr_rsa(int cfd)
 	kdata.desc = dinit.desc;
 	kdata.data = data;
 	kdata.data_size = sizeof(data);
-	kdata.append_flag = 0;
 
 	if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) {
 		fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
@@ -676,7 +675,6 @@ static int test_ncr_rsa(int cfd)
 	kdata.desc = dinit.desc;
 	kdata.data = data;
 	kdata.data_size = sizeof(data);
-	kdata.append_flag = 0;
 
 	if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) {
 		fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
@@ -788,7 +786,6 @@ static int test_ncr_dsa(int cfd)
 	kdata.desc = dinit.desc;
 	kdata.data = data;
 	kdata.data_size = sizeof(data);
-	kdata.append_flag = 0;
 
 	if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) {
 		fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
@@ -820,7 +817,6 @@ static int test_ncr_dsa(int cfd)
 	kdata.desc = dinit.desc;
 	kdata.data = data;
 	kdata.data_size = sizeof(data);
-	kdata.append_flag = 0;
 
 	if (ioctl(cfd, NCRIO_DATA_GET, &kdata)) {
 		fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
diff --git a/examples/speed.c b/examples/speed.c
index 99dc09e..fc6c29e 100644
--- a/examples/speed.c
+++ b/examples/speed.c
@@ -177,7 +177,6 @@ int encrypt_data_ncr(int cfd, int algo, int chunksize)
 		kdata.data = buffer;
 		kdata.data_size = chunksize;
 		kdata.desc = dd;
-		kdata.append_flag = 0;
 
 		if (ioctl(cfd, NCRIO_DATA_SET, &kdata)) {
 			fprintf(stderr, "Error: %s:%d\n", __func__, __LINE__);
diff --git a/ncr-data.c b/ncr-data.c
index 8763234..21aabe4 100644
--- a/ncr-data.c
+++ b/ncr-data.c
@@ -282,37 +282,16 @@ int ncr_data_set(struct list_sem_st* lst, void __user* arg)
 		goto cleanup;
 	}
 
-	if (!get.append_flag) {
-		if (get.data != NULL) {
-			if (unlikely(copy_from_user(data->data, get.data,
-						    get.data_size))) {
-				err();
-				ret = -EFAULT;
-				goto cleanup;
-			}
-		}
-		data->data_size = get.data_size;
-	} else {
-		size_t offset;
-
-		offset = data->data_size;
-		/* get.data_size <= data->max_data_size, which is limited in
-		   data_alloc(), so there is no integer overflow. */
-		if (get.data_size+offset > data->max_data_size) {
+	if (get.data != NULL) {
+		if (unlikely(copy_from_user(data->data, get.data,
+					    get.data_size))) {
 			err();
-			ret = -EINVAL;
+			ret = -EFAULT;
 			goto cleanup;
 		}
-		if (get.data != NULL) {
-			if (unlikely(copy_from_user(&data->data[offset],
-						    get.data, get.data_size))) {
-				err();
-				ret = -EFAULT;
-				goto cleanup;
-			}		
-		}
-		data->data_size = offset + get.data_size;
 	}
+	data->data_size = get.data_size;
+
 	ret = 0;
 
 cleanup: